Changeset cfb79747 in mainline for uspace/drv/bus

Timestamp:

2012-02-14T22:06:15Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

a31aad1

Parents:

199112e4 (diff), e10d41a (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.

Location:

uspace/drv/bus

Files:

• isa/isa.c (modified) (1 diff)
• isa/isa.dev (modified) (1 diff)
• isa/isa.ma (modified) (1 diff)
• pci/pciintel/pci.c (modified) (1 diff)
• usb/usbhid/mouse/mousedev.c (modified) (2 diffs)

uspace/drv/bus/isa/isa.c

@@ -401 +401 @@
 
         val = skip_spaces(val);
-        irq = (int)strtol(val, &end, 10);
+        irq = (int) strtol(val, &end, 10);
 
         if (val != end)

uspace/drv/bus/isa/isa.dev

@@ -14 +14 @@
         irq 12
         io_range 060 5
-        
 
 ne2k:

uspace/drv/bus/isa/isa.ma

@@ -1 @@
-9 pci/ven=8086&dev=7000
+9 pci/class=06&subclass=01

uspace/drv/bus/pci/pciintel/pci.c

@@ -92 +92 @@
 static bool pciintel_enable_interrupt(ddf_fun_t *fnode)
 {
-        /* This is an old ugly way, copied from ne2000 driver */
+        /* This is an old ugly way */
         assert(fnode);
         pci_fun_t *dev_data = (pci_fun_t *) fnode->driver_data;

uspace/drv/bus/usb/usbhid/mouse/mousedev.c

@@ -167 +167 @@
         return result;
 }
-/*----------------------------------------------------------------------------*/
+
 static bool usb_mouse_process_report(usb_hid_dev_t *hid_dev,
     usb_mouse_t *mouse_dev)
@@ -305 +305 @@
         return EOK;
 }
-/*----------------------------------------------------------------------------*/
+
 /** Get highest index of a button mentioned in given report.
  *