Changeset 1bebadee in mainline for uspace/lib/c


Ignore:
Timestamp:
2012-07-18T11:11:29Z (14 years ago)
Author:
Jan Vesely <jano.vesely@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
c5cbc1b7
Parents:
1f7da3b (diff), 730dce77 (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.

Conflict in uspace/lib/drv/generic/dev_iface.c:

Resolved by using c99 method for array initialization for ahci too.

AHCI drivers
kernel console tab completion

Location:
uspace/lib/c
Files:
2 added
2 edited

Legend:

Unmodified
Added
Removed

  • uspace/lib/c/Makefile

    r1f7da3b r1bebadee  
    7171        generic/device/nic.c \
    7272        generic/device/pci.c \
     73        generic/device/ahci.c \
    7374        generic/elf/elf_load.c \
    7475        generic/event.c \

  • uspace/lib/c/include/ipc/dev_iface.h

    r1f7da3b r1bebadee  
    5757        /** Interface provided by USB HID devices. */
    5858        USBHID_DEV_IFACE,
     59        /** Interface provided by AHCI devices. */
     60        AHCI_DEV_IFACE,
    5961
    6062        DEV_IFACE_MAX
Note: See TracChangeset for help on using the changeset viewer.