Changeset 03362fbd in mainline for uspace/drv

Timestamp:

2013-02-09T23:14:45Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

22dfd38

Parents:

b5d2e57 (diff), 005b765 (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 resulting from bool.h → stdbool.h move and ddf structs turning opaque.
Fails to boot to shell console.

Location:

uspace/drv

Files:

• audio/sb16/dsp.c (modified) (view diffs)
• audio/sb16/main.c (modified) (view diffs)
• audio/sb16/mixer.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/ahci/ahci.h (modified) (view diffs)
• block/ahci/ahci_hw.h (modified) (view diffs)
• block/ahci/ahci_sata.h (modified) (view diffs)
• bus/isa/i8237.c (modified) (view diffs)
• bus/isa/isa.c (modified) (view diffs)
• bus/isa/isa.dev (modified) (view diffs)
• bus/pci/pciintel/pci.c (modified) (view diffs)
• bus/pci/pciintel/pci.h (modified) (view diffs)
• bus/usb/ehci/ehci.ma (modified) (view diffs)
• bus/usb/ehci/main.c (modified) (view diffs)
• bus/usb/ehci/res.c (modified) (view diffs)
• bus/usb/ehci/res.h (modified) (view diffs)
• bus/usb/ohci/endpoint_list.c (modified) (view diffs)
• bus/usb/ohci/hc.c (modified) (view diffs)
• bus/usb/ohci/hw_struct/endpoint_descriptor.c (modified) (view diffs)
• bus/usb/ohci/hw_struct/endpoint_descriptor.h (modified) (view diffs)
• bus/usb/ohci/hw_struct/hcca.h (modified) (view diffs)
• bus/usb/ohci/hw_struct/mem_access.h (added)
• bus/usb/ohci/hw_struct/transfer_descriptor.c (modified) (view diffs)
• bus/usb/ohci/hw_struct/transfer_descriptor.h (modified) (view diffs)
• bus/usb/ohci/main.c (modified) (view diffs)
• bus/usb/ohci/ohci.c (modified) (view diffs)
• bus/usb/ohci/ohci.ma (modified) (view diffs)
• bus/usb/ohci/ohci_batch.c (modified) (view diffs)
• bus/usb/ohci/ohci_batch.h (modified) (view diffs)
• bus/usb/ohci/ohci_endpoint.c (modified) (view diffs)
• bus/usb/ohci/ohci_regs.h (modified) (view diffs)
• bus/usb/ohci/res.c (modified) (view diffs)
• bus/usb/ohci/res.h (modified) (view diffs)
• bus/usb/ohci/root_hub.c (modified) (view diffs)
• bus/usb/ohci/utils/malloc32.h (modified) (view diffs)
• bus/usb/uhci/hc.c (modified) (view diffs)
• bus/usb/uhci/hc.h (modified) (view diffs)
• bus/usb/uhci/hw_struct/queue_head.h (modified) (view diffs)
• bus/usb/uhci/hw_struct/transfer_descriptor.c (modified) (view diffs)
• bus/usb/uhci/hw_struct/transfer_descriptor.h (modified) (view diffs)
• bus/usb/uhci/main.c (modified) (view diffs)
• bus/usb/uhci/res.c (modified) (view diffs)
• bus/usb/uhci/res.h (modified) (view diffs)
• bus/usb/uhci/transfer_list.c (modified) (view diffs)
• bus/usb/uhci/uhci.c (modified) (view diffs)
• bus/usb/uhci/uhci_batch.c (modified) (view diffs)
• bus/usb/uhci/uhci_batch.h (modified) (view diffs)
• bus/usb/uhci/utils/malloc32.h (modified) (view diffs)
• bus/usb/uhcirh/main.c (modified) (view diffs)
• bus/usb/uhcirh/port.c (modified) (view diffs)
• bus/usb/uhcirh/root_hub.c (modified) (view diffs)
• bus/usb/usbflbk/main.c (modified) (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/kbd/kbdrepeat.c (modified) (view diffs)
• bus/usb/usbhid/kbd/kbdrepeat.h (modified) (view diffs)
• bus/usb/usbhid/main.c (modified) (view diffs)
• bus/usb/usbhid/mouse/mousedev.c (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.h (modified) (view diffs)
• bus/usb/usbhid/usbhid.c (modified) (view diffs)
• bus/usb/usbhid/usbhid.h (modified) (view diffs)
• bus/usb/usbhub/main.c (modified) (view diffs)
• bus/usb/usbhub/port.c (modified) (view diffs)
• bus/usb/usbhub/status.h (modified) (view diffs)
• bus/usb/usbhub/usbhub.c (modified) (view diffs)
• bus/usb/usbmast/bo_trans.c (modified) (view diffs)
• bus/usb/usbmast/main.c (modified) (view diffs)
• bus/usb/usbmast/scsi_ms.c (modified) (view diffs)
• bus/usb/usbmast/usbmast.h (modified) (view diffs)
• bus/usb/usbmid/explore.c (modified) (view diffs)
• bus/usb/usbmid/main.c (modified) (view diffs)
• bus/usb/usbmid/usbmid.c (modified) (view diffs)
• bus/usb/vhc/Makefile (modified) (view diffs)
• bus/usb/vhc/conndev.c (modified) (view diffs)
• bus/usb/vhc/connhost.c (modified) (view diffs)
• bus/usb/vhc/hub.c (modified) (view diffs)
• bus/usb/vhc/main.c (modified) (view diffs)
• char/i8042/i8042.c (modified) (view diffs)
• char/i8042/main.c (modified) (view diffs)
• char/ns8250/cyclic_buffer.h (modified) (view diffs)
• char/ns8250/ns8250.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/Makefile (added)
• fb/amdm37x_dispc/amdm37x_dispc.c (added)
• fb/amdm37x_dispc/amdm37x_dispc.h (added)
• fb/amdm37x_dispc/amdm37x_dispc.ma (added)
• fb/amdm37x_dispc/amdm37x_dispc_regs.h (added)
• fb/amdm37x_dispc/main.c (added)
• fb/kfb/Makefile (moved) (moved from uspace/lib/ext2/Makefile ) (view diffs)
• fb/kfb/kfb.c (added)
• fb/kfb/kfb.h (moved) (moved from uspace/lib/ext2/libext2.h ) (view diffs)
• fb/kfb/kfb.ma (added)
• fb/kfb/port.c (added)
• fb/kfb/port.h (added)
• infrastructure/root/root.c (modified) (view diffs)
• infrastructure/rootamdm37x/Makefile (added)
• infrastructure/rootamdm37x/amdm37x.c (added)
• infrastructure/rootamdm37x/amdm37x.h (added)
• infrastructure/rootamdm37x/cm/clock_control.h (added)
• infrastructure/rootamdm37x/cm/core.h (added)
• infrastructure/rootamdm37x/cm/iva2.h (added)
• infrastructure/rootamdm37x/cm/mpu.h (added)
• infrastructure/rootamdm37x/cm/usbhost.h (added)
• infrastructure/rootamdm37x/prm/clock_control.h (moved) (moved from uspace/lib/c/include/adt/hash_set.h ) (view diffs)
• infrastructure/rootamdm37x/prm/global_reg.h (added)
• infrastructure/rootamdm37x/prm/usbhost.h (added)
• infrastructure/rootamdm37x/rootamdm37x.c (added)
• infrastructure/rootamdm37x/rootamdm37x.ma (added)
• infrastructure/rootamdm37x/uhh.h (added)
• infrastructure/rootamdm37x/usbtll.h (added)
• infrastructure/rootmac/rootmac.c (modified) (view diffs)
• infrastructure/rootpc/rootpc.c (modified) (view diffs)
• infrastructure/rootvirt/devices.def (modified) (view diffs)
• infrastructure/rootvirt/rootvirt.c (modified) (view diffs)
• nic/e1k/e1k.c (modified) (view diffs)
• nic/ne2k/dp8390.c (modified) (view diffs)
• nic/ne2k/ne2k.c (modified) (view diffs)
• nic/rtl8139/defs.h (modified) (view diffs)
• nic/rtl8139/driver.c (modified) (view diffs)
• test/test1/test1.c (modified) (view diffs)
• test/test2/test2.c (modified) (view diffs)
• test/test3/test3.c (modified) (view diffs)
• time/cmos-rtc/Makefile (added)
• time/cmos-rtc/cmos-regs.h (added)
• time/cmos-rtc/cmos-rtc.c (added)
• time/cmos-rtc/cmos-rtc.ma (added)