Changeset a1347a7 in mainline for uspace/drv/bus/isa/isa.c

Timestamp:

2012-01-15T13:51:09Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

bd79281

Parents:

03e0a244 (diff), f302586 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

• uspace/drv/bus/isa/isa.c (modified) (6 diffs)

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)