Changeset ebb1489 in mainline for uspace/drv/bus/isa/isa.dev

Timestamp:

2024-10-13T08:23:40Z (2 months ago)

Author:

GitHub <noreply@…>

Children:

0472cf17

Parents:

2a0c827c (diff), b3b79981 (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.

git-author:

boba-buba <120932204+boba-buba@…> (2024-10-13 08:23:40)

git-committer:

GitHub <noreply@…> (2024-10-13 08:23:40)

Message:

Merge branch 'HelenOS:master' into topic/packet-capture

File:

• uspace/drv/bus/isa/isa.dev (modified) (1 diff)

uspace/drv/bus/isa/isa.dev

@@ -51 +51 @@
         io_range 70 2
 
-ata-c1:
-        match 100 isa/ata_bd
+fdc:
+        match 100 isa/fdc
+        io_range 0x3f0 8
+        irq 6
+        dma 2
+
+ide1:
+        match 100 isa/ide
         io_range 0x1f0 8
         io_range 0x3f0 8
-
-ata-c2:
-        match 100 isa/ata_bd
         io_range 0x170 8
         io_range 0x370 8
-
-ata-c3:
-        match 100 isa/ata_bd
-        io_range 0x1e8 8
-        io_range 0x3e8 8
-
-ata-c4:
-        match 100 isa/ata_bd
-        io_range 0x168 8
-        io_range 0x368 8
+        irq 14
+        irq 15