Changes in / [7e1b130:b39eb79] in mainline

Files:

• boot/arch/amd64/Makefile.inc (modified) (1 diff)
• uspace/Makefile (modified) (1 diff)
• uspace/app/init/init.c (modified) (1 diff)
• uspace/drv/bus/isa/isa.c (modified) (6 diffs)
• uspace/drv/bus/isa/isa.dev (modified) (1 diff)
• uspace/drv/char/i8042/Makefile (added)
• uspace/drv/char/i8042/buffer.h (added)
• uspace/drv/char/i8042/i8042.c (added)
• uspace/drv/char/i8042/i8042.h (added)
• uspace/drv/char/i8042/i8042.ma (added)
• uspace/drv/char/i8042/main.c (added)
• uspace/drv/char/ps2mouse/Makefile (added)
• uspace/drv/char/ps2mouse/main.c (added)
• uspace/drv/char/ps2mouse/ps2mouse.c (added)
• uspace/drv/char/ps2mouse/ps2mouse.h (added)
• uspace/drv/char/ps2mouse/ps2mouse.ma (added)
• uspace/drv/char/xtkbd/Makefile (added)
• uspace/drv/char/xtkbd/main.c (added)
• uspace/drv/char/xtkbd/xtkbd.c (added)
• uspace/drv/char/xtkbd/xtkbd.h (added)
• uspace/drv/char/xtkbd/xtkbd.ma (added)

boot/arch/amd64/Makefile.inc

@@ -39 +39 @@
         bus/pci/pciintel \
         bus/isa \
+        char/i8042 \
         char/ns8250 \
+        char/ps2mouse \
+        char/xtkbd \
         bus/usb/ehci\
         bus/usb/ohci \

uspace/Makefile

@@ -105 +105 @@
         drv/infrastructure/root \
         drv/infrastructure/rootvirt \
+        drv/char/i8042 \
+        drv/char/ps2mouse \
+        drv/char/xtkbd \
         drv/test/test1 \
         drv/test/test2 \

uspace/app/init/init.c

@@ -302 +302 @@
         spawn("/srv/obio");
         srv_start("/srv/cuda_adb");
-        srv_start("/srv/i8042");
+//      srv_start("/srv/i8042");
         srv_start("/srv/s3c24ser");
         srv_start("/srv/s3c24ts");

uspace/drv/bus/isa/isa.c

@@ -52 +52 @@
 #include <dirent.h>
 #include <fcntl.h>
+#include <ipc/irc.h>
+#include <ipc/services.h>
+#include <sysinfo.h>
+#include <ns.h>
 #include <sys/stat.h>
 #include <ipc/irc.h>
@@ -109 +113 @@
         sysarg_t apic;
         sysarg_t i8259;
-        
+
         async_sess_t *irc_sess = NULL;
-        
+
         if (((sysinfo_get_value("apic", &apic) == EOK) && (apic))
             || ((sysinfo_get_value("i8259", &i8259) == EOK) && (i8259))) {
@@ -117 +121 @@
                     SERVICE_IRC, 0, 0);
         }
-        
+
         if (!irc_sess)
                 return false;
-        
+
         assert(isa_fun);
         const hw_resource_list_t *res = &isa_fun->hw_resources;
@@ -127 +131 @@
                 if (res->resources[i].type == INTERRUPT) {
                         const int irq = res->resources[i].res.interrupt.irq;
-                        
+
                         async_exch_t *exch = async_exchange_begin(irc_sess);
                         const int rc =
                             async_req_1_0(exch, IRC_ENABLE_INTERRUPT, irq);
                         async_exchange_end(exch);
-                        
+
                         if (rc != EOK) {
                                 async_hangup(irc_sess);
@@ -139 +143 @@
                 }
         }
-        
+
         async_hangup(irc_sess);
         return true;
@@ -397 +401 @@
 
         val = skip_spaces(val);
-        irq = (int)strtol(val, &end, 0x10);
+        irq = (int)strtol(val, &end, 10);
 
         if (val != end)

uspace/drv/bus/isa/isa.dev

@@ -9 +9 @@
         io_range 2f8 8
 
-keyboard:
-        match 100 isa/keyboard
+i8042:
+        match 100 isa/i8042
         irq 1
-        io_range 060 10
+        irq 12
+        io_range 060 5
+        
 
 ne2k: