Changeset 00aece0 in mainline for uspace/drv/bus/isa/isa.dev

Timestamp:

2012-02-18T16:47:38Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4449c6c

Parents:

bd5f3b7 (diff), f943dd3 (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.dev (modified) (1 diff)

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:
+        match 100 isa/ne2k
+        irq 5
+        io_range 300 20
+
+sb16:
+        match 100 isa/sb16
+        io_range 220 20
+        io_range 330 2
+        irq 5
+        dma 1
+        dma 5