Changeset 95c675b in mainline for uspace/drv

Timestamp:

2017-10-17T13:11:35Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

60af4cdb

Parents:

dbf32b1 (diff), a416d070 (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

Location:

uspace/drv

Files:

• audio/hdaudio/hdaudio.c (modified) (view diffs)
• audio/sb16/dsp.c (modified) (view diffs)
• audio/sb16/main.c (modified) (view diffs)
• block/ahci/ahci.c (modified) (view diffs)
• block/ahci/ahci.h (modified) (view diffs)
• block/ata_bd/main.c (modified) (view diffs)
• block/ddisk/ddisk.c (modified) (view diffs)
• bus/adb/cuda_adb/Makefile (moved) (moved from uspace/srv/hw/bus/cuda_adb/Makefile ) (view diffs)
• bus/adb/cuda_adb/cuda_adb.c (added)
• bus/adb/cuda_adb/cuda_adb.h (added)
• bus/adb/cuda_adb/cuda_adb.ma (added)
• bus/adb/cuda_adb/cuda_hw.h (moved) (moved from uspace/srv/hw/bus/cuda_adb/cuda_adb.h ) (view diffs)
• bus/adb/cuda_adb/main.c (added)
• bus/isa/i8237.c (modified) (view diffs)
• bus/isa/isa.c (modified) (view diffs)
• bus/pci/pciintel/pci.c (modified) (view diffs)
• bus/usb/ehci/res.c (modified) (view diffs)
• bus/usb/ohci/hw_struct/transfer_descriptor.c (modified) (view diffs)
• bus/usb/ohci/ohci_rh.c (modified) (view diffs)
• bus/usb/uhci/main.c (modified) (view diffs)
• bus/usb/usbhub/status.h (modified) (view diffs)
• bus/usb/usbhub/usbhub.h (modified) (view diffs)
• bus/usb/usbmid/explore.c (modified) (view diffs)
• char/atkbd/atkbd.c (modified) (view diffs)
• char/atkbd/main.c (modified) (view diffs)
• char/i8042/i8042.c (modified) (view diffs)
• char/i8042/main.c (modified) (view diffs)
• char/ns8250/ns8250.c (modified) (view diffs)
• char/pl050/pl050.c (modified) (view diffs)
• char/ps2mouse/main.c (modified) (view diffs)
• char/ps2mouse/ps2mouse.c (modified) (view diffs)
• char/xtkbd/main.c (modified) (view diffs)
• char/xtkbd/xtkbd.c (modified) (view diffs)
• fb/amdm37x_dispc/amdm37x_dispc.c (modified) (view diffs)
• fb/amdm37x_dispc/main.c (modified) (view diffs)
• fb/kfb/port.c (modified) (view diffs)
• intctl/icp-ic/Makefile (added)
• intctl/icp-ic/icp-ic.c (moved) (moved from uspace/srv/hw/irc/icp-ic/icp-ic.c ) (view diffs)
• intctl/icp-ic/icp-ic.h (added)
• intctl/icp-ic/icp-ic.ma (added)
• intctl/icp-ic/icp-ic_hw.h (moved) (moved from uspace/srv/hw/irc/icp-ic/icp-ic_hw.h ) (view diffs)
• intctl/icp-ic/main.c (added)
• nic/e1k/e1k.c (modified) (view diffs)
• nic/ne2k/dp8390.h (modified) (view diffs)
• nic/ne2k/ne2k.c (modified) (view diffs)
• nic/rtl8139/driver.c (modified) (view diffs)
• nic/rtl8139/driver.h (modified) (view diffs)
• nic/rtl8169/driver.c (modified) (view diffs)
• nic/rtl8169/driver.h (modified) (view diffs)
• platform/amdm37x/main.c (modified) (view diffs)
• platform/icp/icp.c (modified) (view diffs)
• platform/mac/mac.c (modified) (view diffs)
• platform/malta/malta.c (modified) (view diffs)
• platform/msim/msim.c (modified) (view diffs)
• platform/pc/pc.c (modified) (view diffs)
• platform/sun4u/sun4u.c (modified) (view diffs)
• test/test1/test1.c (modified) (view diffs)
• time/cmos-rtc/cmos-rtc.c (modified) (view diffs)