Changeset 8e7c9fe in mainline for uspace/drv

Timestamp:

2014-09-12T03:45:25Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

c53b58e

Parents:

3eb0c85 (diff), 105d8d6 (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

most usb changes were reverted. blink and usbmass were fixed
known problems:
ehci won't initialize
usbmast asserts on unmount (happens on mainline too)

Location:

uspace/drv

Files:

• audio/hdaudio/Makefile (added)
• audio/hdaudio/codec.c (added)
• audio/hdaudio/codec.h (moved) (moved from kernel/arch/mips64/include/arch/mm/frame.h ) (view diffs)
• audio/hdaudio/hdactl.c (added)
• audio/hdaudio/hdactl.h (moved) (moved from kernel/arch/mips64/include/arch/context.h ) (view diffs)
• audio/hdaudio/hdaudio.c (added)
• audio/hdaudio/hdaudio.h (added)
• audio/hdaudio/hdaudio.ma (added)
• audio/hdaudio/pcm_iface.c (added)
• audio/hdaudio/pcm_iface.h (moved) (moved from kernel/arch/mips64/include/arch/fpu_context.h ) (view diffs)
• audio/hdaudio/regif.c (moved) (moved from kernel/arch/mips64/src/smp/smp.c ) (view diffs)
• audio/hdaudio/regif.h (added)
• audio/hdaudio/spec/bdl.h (moved) (moved from kernel/arch/mips64/include/arch/proc/thread.h ) (view diffs)
• audio/hdaudio/spec/codec.h (added)
• audio/hdaudio/spec/fmt.h (added)
• audio/hdaudio/spec/regs.h (added)
• audio/hdaudio/stream.c (added)
• audio/hdaudio/stream.h (moved) (moved from kernel/arch/mips64/include/arch/mm/page.h ) (view diffs)
• audio/sb16/dsp.c (modified) (view diffs)
• audio/sb16/main.c (modified) (view diffs)
• audio/sb16/mixer_iface.c (modified) (view diffs)
• audio/sb16/pcm_iface.c (modified) (view diffs)
• audio/sb16/sb16.c (modified) (view diffs)
• block/ahci/ahci.c (modified) (view diffs)
• block/ata_bd/Makefile (modified) (view diffs)
• block/ata_bd/ata_bd.c (modified) (view diffs)
• block/ata_bd/ata_hw.h (modified) (view diffs)
• bus/isa/isa.c (modified) (view diffs)
• bus/pci/pciintel/pci.c (modified) (view diffs)
• bus/usb/uhci/utils/malloc32.h (modified) (view diffs)
• bus/usb/usbhid/Makefile (modified) (view diffs)
• bus/usb/usbhid/blink1/blink1.c (added)
• bus/usb/usbhid/blink1/blink1.h (moved) (moved from kernel/arch/mips64/include/arch/arch.h ) (view diffs)
• bus/usb/usbhid/generic/hiddev.c (modified) (view diffs)
• bus/usb/usbhid/generic/hiddev.h (modified) (view diffs)
• bus/usb/usbhid/kbd/kbddev.c (modified) (view diffs)
• bus/usb/usbhid/kbd/kbddev.h (modified) (view diffs)
• bus/usb/usbhid/mouse/mousedev.h (modified) (view diffs)
• bus/usb/usbhid/multimedia/multimedia.c (modified) (view diffs)
• bus/usb/usbhid/multimedia/multimedia.h (modified) (view diffs)
• bus/usb/usbhid/subdrivers.c (modified) (view diffs)
• bus/usb/usbhid/subdrivers.h (modified) (view diffs)
• bus/usb/usbhid/usbhid.c (modified) (view diffs)
• bus/usb/usbhid/usbhid.ma (modified) (view diffs)
• bus/usb/usbmast/bo_trans.h (modified) (view diffs)
• bus/usb/usbmast/main.c (modified) (view diffs)
• bus/usb/usbmast/scsi_ms.c (modified) (view diffs)
• bus/usb/usbmast/scsi_ms.h (modified) (view diffs)
• char/i8042/i8042.c (modified) (view diffs)
• char/i8042/i8042.h (modified) (view diffs)
• char/i8042/main.c (modified) (view diffs)
• char/ns8250/ns8250.c (modified) (view diffs)
• char/pl050/Makefile (added)
• char/pl050/pl050.c (added)
• char/pl050/pl050.ma (added)
• char/pl050/pl050_hw.h (moved) (moved from uspace/lib/c/arch/mips64/include/libarch/fibril.h ) (view diffs)
• char/ps2mouse/Makefile (modified) (view diffs)
• char/ps2mouse/ps2mouse.c (modified) (view diffs)
• char/xtkbd/Makefile (modified) (view diffs)
• char/xtkbd/chardev.c (deleted)
• 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/kfb.c (modified) (view diffs)
• fb/kfb/port.c (modified) (view diffs)
• infrastructure/rootvirt/rootvirt.ma (deleted)
• nic/e1k/e1k.c (modified) (view diffs)
• nic/ne2k/ne2k.c (modified) (view diffs)
• nic/rtl8139/driver.c (modified) (view diffs)
• nic/rtl8169/Makefile (added)
• nic/rtl8169/defs.h (added)
• nic/rtl8169/driver.c (added)
• nic/rtl8169/driver.h (added)
• nic/rtl8169/rtl8169.ma (added)
• platform/amdm37x/Makefile (moved) (moved from uspace/drv/infrastructure/rootamdm37x/Makefile ) (view diffs)
• platform/amdm37x/amdm37x.c (moved) (moved from uspace/drv/infrastructure/rootamdm37x/amdm37x.c ) (view diffs)
• platform/amdm37x/amdm37x.h (moved) (moved from uspace/drv/infrastructure/rootamdm37x/amdm37x.h ) (view diffs)
• platform/amdm37x/amdm37x.ma (moved) (moved from uspace/drv/infrastructure/rootamdm37x/rootamdm37x.ma ) (view diffs)
• platform/amdm37x/cm/clock_control.h (moved) (moved from uspace/drv/infrastructure/rootamdm37x/cm/clock_control.h ) (view diffs)
• platform/amdm37x/cm/core.h (moved) (moved from uspace/drv/infrastructure/rootamdm37x/cm/core.h ) (view diffs)
• platform/amdm37x/cm/iva2.h (moved) (moved from uspace/drv/infrastructure/rootamdm37x/cm/iva2.h ) (view diffs)
• platform/amdm37x/cm/mpu.h (moved) (moved from uspace/drv/infrastructure/rootamdm37x/cm/mpu.h ) (view diffs)
• platform/amdm37x/cm/usbhost.h (moved) (moved from uspace/drv/infrastructure/rootamdm37x/cm/usbhost.h ) (view diffs)
• platform/amdm37x/main.c (moved) (moved from uspace/drv/infrastructure/rootamdm37x/rootamdm37x.c ) (view diffs)
• platform/amdm37x/prm/clock_control.h (moved) (moved from uspace/drv/infrastructure/rootamdm37x/prm/clock_control.h ) (view diffs)
• platform/amdm37x/prm/global_reg.h (moved) (moved from uspace/drv/infrastructure/rootamdm37x/prm/global_reg.h ) (view diffs)
• platform/amdm37x/prm/usbhost.h (moved) (moved from uspace/drv/infrastructure/rootamdm37x/prm/usbhost.h ) (view diffs)
• platform/amdm37x/uhh.h (moved) (moved from uspace/drv/infrastructure/rootamdm37x/uhh.h ) (view diffs)
• platform/amdm37x/usbtll.h (moved) (moved from uspace/drv/infrastructure/rootamdm37x/usbtll.h ) (view diffs)
• platform/icp/Makefile (added)
• platform/icp/icp.c (added)
• platform/icp/icp.ma (added)
• platform/leon3/Makefile (moved) (moved from uspace/drv/infrastructure/rootleon3/Makefile ) (view diffs)
• platform/leon3/leon3.c (moved) (moved from uspace/drv/infrastructure/rootleon3/rootleon3.c ) (view diffs)
• platform/leon3/leon3.h (moved) (moved from uspace/drv/infrastructure/rootleon3/rootleon3.h ) (view diffs)
• platform/leon3/leon3.ma (moved) (moved from uspace/drv/infrastructure/rootleon3/rootleon3.ma ) (view diffs)
• platform/mac/Makefile (moved) (moved from uspace/drv/infrastructure/rootpc/Makefile ) (view diffs)
• platform/mac/mac.c (moved) (moved from uspace/drv/infrastructure/rootmac/rootmac.c ) (view diffs)
• platform/mac/mac.ma (moved) (moved from uspace/drv/infrastructure/rootmac/rootmac.ma ) (view diffs)
• platform/malta/Makefile (moved) (moved from uspace/drv/infrastructure/rootmac/Makefile ) (view diffs)
• platform/malta/malta.c (moved) (moved from uspace/drv/infrastructure/rootmalta/rootmalta.c ) (view diffs)
• platform/malta/malta.ma (moved) (moved from uspace/drv/infrastructure/rootmalta/rootmalta.ma ) (view diffs)
• platform/pc/Makefile (moved) (moved from uspace/drv/infrastructure/rootmalta/Makefile ) (view diffs)
• platform/pc/pc.c (moved) (moved from uspace/drv/infrastructure/rootpc/rootpc.c ) (view diffs)
• platform/pc/pc.ma (moved) (moved from uspace/drv/infrastructure/rootpc/rootpc.ma ) (view diffs)
• root/root/Makefile (moved) (moved from uspace/drv/infrastructure/root/Makefile ) (view diffs)
• root/root/root.c (moved) (moved from uspace/drv/infrastructure/root/root.c ) (view diffs)
• root/root/root.ma (moved) (moved from uspace/drv/infrastructure/root/root.ma ) (view diffs)
• root/virt/Makefile (moved) (moved from uspace/drv/infrastructure/rootvirt/Makefile ) (view diffs)
• root/virt/devices.def (moved) (moved from uspace/drv/infrastructure/rootvirt/devices.def ) (view diffs)
• root/virt/virt.c (moved) (moved from uspace/drv/infrastructure/rootvirt/rootvirt.c ) (view diffs)
• root/virt/virt.ma (added)