Changeset 03362fbd in mainline for uspace/drv/bus

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/bus

Files:

• isa/i8237.c (modified) (view diffs)
• isa/isa.c (modified) (view diffs)
• isa/isa.dev (modified) (view diffs)
• pci/pciintel/pci.c (modified) (view diffs)
• pci/pciintel/pci.h (modified) (view diffs)
• usb/ehci/ehci.ma (modified) (view diffs)
• usb/ehci/main.c (modified) (view diffs)
• usb/ehci/res.c (modified) (view diffs)
• usb/ehci/res.h (modified) (view diffs)
• usb/ohci/endpoint_list.c (modified) (view diffs)
• usb/ohci/hc.c (modified) (view diffs)
• usb/ohci/hw_struct/endpoint_descriptor.c (modified) (view diffs)
• usb/ohci/hw_struct/endpoint_descriptor.h (modified) (view diffs)
• usb/ohci/hw_struct/hcca.h (modified) (view diffs)
• usb/ohci/hw_struct/mem_access.h (added)
• usb/ohci/hw_struct/transfer_descriptor.c (modified) (view diffs)
• usb/ohci/hw_struct/transfer_descriptor.h (modified) (view diffs)
• usb/ohci/main.c (modified) (view diffs)
• usb/ohci/ohci.c (modified) (view diffs)
• usb/ohci/ohci.ma (modified) (view diffs)
• usb/ohci/ohci_batch.c (modified) (view diffs)
• usb/ohci/ohci_batch.h (modified) (view diffs)
• usb/ohci/ohci_endpoint.c (modified) (view diffs)
• usb/ohci/ohci_regs.h (modified) (view diffs)
• usb/ohci/res.c (modified) (view diffs)
• usb/ohci/res.h (modified) (view diffs)
• usb/ohci/root_hub.c (modified) (view diffs)
• usb/ohci/utils/malloc32.h (modified) (view diffs)
• usb/uhci/hc.c (modified) (view diffs)
• usb/uhci/hc.h (modified) (view diffs)
• usb/uhci/hw_struct/queue_head.h (modified) (view diffs)
• usb/uhci/hw_struct/transfer_descriptor.c (modified) (view diffs)
• usb/uhci/hw_struct/transfer_descriptor.h (modified) (view diffs)
• usb/uhci/main.c (modified) (view diffs)
• usb/uhci/res.c (modified) (view diffs)
• usb/uhci/res.h (modified) (view diffs)
• usb/uhci/transfer_list.c (modified) (view diffs)
• usb/uhci/uhci.c (modified) (view diffs)
• usb/uhci/uhci_batch.c (modified) (view diffs)
• usb/uhci/uhci_batch.h (modified) (view diffs)
• usb/uhci/utils/malloc32.h (modified) (view diffs)
• usb/uhcirh/main.c (modified) (view diffs)
• usb/uhcirh/port.c (modified) (view diffs)
• usb/uhcirh/root_hub.c (modified) (view diffs)
• usb/usbflbk/main.c (modified) (view diffs)
• usb/usbhid/generic/hiddev.c (modified) (view diffs)
• usb/usbhid/generic/hiddev.h (modified) (view diffs)
• usb/usbhid/kbd/kbddev.c (modified) (view diffs)
• usb/usbhid/kbd/kbddev.h (modified) (view diffs)
• usb/usbhid/kbd/kbdrepeat.c (modified) (view diffs)
• usb/usbhid/kbd/kbdrepeat.h (modified) (view diffs)
• usb/usbhid/main.c (modified) (view diffs)
• usb/usbhid/mouse/mousedev.c (modified) (view diffs)
• usb/usbhid/mouse/mousedev.h (modified) (view diffs)
• usb/usbhid/multimedia/multimedia.c (modified) (view diffs)
• usb/usbhid/multimedia/multimedia.h (modified) (view diffs)
• usb/usbhid/subdrivers.h (modified) (view diffs)
• usb/usbhid/usbhid.c (modified) (view diffs)
• usb/usbhid/usbhid.h (modified) (view diffs)
• usb/usbhub/main.c (modified) (view diffs)
• usb/usbhub/port.c (modified) (view diffs)
• usb/usbhub/status.h (modified) (view diffs)
• usb/usbhub/usbhub.c (modified) (view diffs)
• usb/usbmast/bo_trans.c (modified) (view diffs)
• usb/usbmast/main.c (modified) (view diffs)
• usb/usbmast/scsi_ms.c (modified) (view diffs)
• usb/usbmast/usbmast.h (modified) (view diffs)
• usb/usbmid/explore.c (modified) (view diffs)
• usb/usbmid/main.c (modified) (view diffs)
• usb/usbmid/usbmid.c (modified) (view diffs)
• usb/vhc/Makefile (modified) (view diffs)
• usb/vhc/conndev.c (modified) (view diffs)
• usb/vhc/connhost.c (modified) (view diffs)
• usb/vhc/hub.c (modified) (view diffs)
• usb/vhc/main.c (modified) (view diffs)