Changeset 8b863a62 in mainline for uspace/drv/bus/isa/isa.dev


Ignore:
Timestamp:
2014-04-16T17:14:06Z (11 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
f857e8b
Parents:
dba3e2c (diff), 70b570c (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:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/drv/bus/isa/isa.dev

    rdba3e2c r8b863a62  
    3131        match 100 isa/cmos-rtc
    3232        io_range 70 2
     33
     34ata-c1:
     35        match 100 isa/ata_bd
     36        io_range 0x1f0 8
     37        io_range 0x3f0 8
     38
     39ata-c2:
     40        match 100 isa/ata_bd
     41        io_range 0x170 8
     42        io_range 0x370 8
     43
     44ata-c3:
     45        match 100 isa/ata_bd
     46        io_range 0x1e8 8
     47        io_range 0x3e8 8
     48
     49ata-c4:
     50        match 100 isa/ata_bd
     51        io_range 0x168 8
     52        io_range 0x368 8
Note: See TracChangeset for help on using the changeset viewer.