Changeset 6843a9c in mainline for uspace/drv

Timestamp:

2012-06-29T13:02:14Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

722912e

Parents:

ba72f2b (diff), 0bbd13e (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

Trivial conflicts.

Location:

uspace/drv

Files:

• bus/isa/Makefile (modified) (view diffs)
• bus/isa/i8237.c (added)
• bus/isa/i8237.h (moved) (moved from uspace/drv/bus/usb/ehci/ehci.h ) (view diffs)
• bus/isa/isa.c (modified) (view diffs)
• bus/isa/isa.dev (modified) (view diffs)
• bus/isa/isa.ma (modified) (view diffs)
• bus/pci/pciintel/pci.c (modified) (view diffs)
• bus/pci/pciintel/pci.h (modified) (view diffs)
• bus/usb/ehci/Makefile (modified) (view diffs)
• bus/usb/ehci/ehci.ma (modified) (view diffs)
• bus/usb/ehci/hc_iface.c (deleted)
• bus/usb/ehci/main.c (modified) (view diffs)
• bus/usb/ehci/pci.c (deleted)
• bus/usb/ehci/res.c (added)
• bus/usb/ehci/res.h (moved) (moved from uspace/drv/bus/usb/ehci/pci.h ) (view diffs)
• bus/usb/ohci/Makefile (modified) (view diffs)
• bus/usb/ohci/endpoint_list.c (modified) (view diffs)
• bus/usb/ohci/endpoint_list.h (modified) (view diffs)
• bus/usb/ohci/hc.c (modified) (view diffs)
• bus/usb/ohci/hc.h (modified) (view diffs)
• bus/usb/ohci/hw_struct/hcca.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_endpoint.h (modified) (view diffs)
• bus/usb/ohci/ohci_regs.h (modified) (view diffs)
• bus/usb/ohci/res.c (moved) (moved from uspace/drv/bus/usb/ohci/pci.c ) (view diffs)
• bus/usb/ohci/res.h (moved) (moved from uspace/drv/bus/usb/ohci/pci.h ) (view diffs)
• bus/usb/ohci/root_hub.c (modified) (view diffs)
• bus/usb/ohci/utils/malloc32.h (modified) (view diffs)
• bus/usb/uhci/Makefile (modified) (view diffs)
• bus/usb/uhci/hc.c (modified) (view diffs)
• bus/usb/uhci/hc.h (modified) (view diffs)
• bus/usb/uhci/main.c (modified) (view diffs)
• bus/usb/uhci/res.c (moved) (moved from uspace/drv/bus/usb/uhci/pci.c ) (view diffs)
• bus/usb/uhci/res.h (moved) (moved from uspace/drv/bus/usb/uhci/pci.h ) (view diffs)
• bus/usb/uhci/transfer_list.c (modified) (view diffs)
• bus/usb/uhci/uhci.c (modified) (view diffs)
• bus/usb/uhci/uhci.ma (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/usbflbk/main.c (modified) (view diffs)
• bus/usb/usbhid/generic/hiddev.c (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/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/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.h (modified) (view diffs)
• bus/usb/usbhub/main.c (modified) (view diffs)
• bus/usb/usbhub/port.c (modified) (view diffs)
• bus/usb/usbhub/port.h (modified) (view diffs)
• bus/usb/usbhub/usbhub.c (modified) (view diffs)
• bus/usb/usbhub/usbhub.h (modified) (view diffs)
• bus/usb/usbmast/bo_trans.c (modified) (view diffs)
• bus/usb/usbmast/main.c (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/usbmid/usbmid.h (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)
• bus/usb/vhc/vhc.ma (modified) (view diffs)
• char/i8042/Makefile (moved) (moved from uspace/srv/hw/char/i8042/Makefile ) (view diffs)
• char/i8042/buffer.h (added)
• char/i8042/i8042.c (added)
• char/i8042/i8042.h (moved) (moved from uspace/lib/net/include/net_checksum.h ) (view diffs)
• char/i8042/i8042.ma (added)
• char/i8042/main.c (added)
• char/ns8250/ns8250.c (modified) (view diffs)
• char/ps2mouse/Makefile (added)
• char/ps2mouse/chardev.c (added)
• char/ps2mouse/chardev.h (added)
• char/ps2mouse/main.c (added)
• char/ps2mouse/ps2mouse.c (added)
• char/ps2mouse/ps2mouse.h (added)
• char/ps2mouse/ps2mouse.ma (added)
• char/xtkbd/Makefile (added)
• char/xtkbd/chardev.c (added)
• char/xtkbd/chardev.h (added)
• char/xtkbd/main.c (added)
• char/xtkbd/xtkbd.c (added)
• char/xtkbd/xtkbd.h (added)
• char/xtkbd/xtkbd.ma (added)
• infrastructure/root/root.c (modified) (view diffs)
• 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/Makefile (moved) (moved from uspace/drv/nic/lo/Makefile ) (view diffs)
• nic/e1k/e1k.c (added)
• nic/e1k/e1k.h (added)
• nic/e1k/e1k.ma (added)
• nic/lo/lo.c (deleted)
• nic/lo/lo.ma (deleted)
• nic/ne2k/Makefile (modified) (view diffs)
• nic/ne2k/dp8390.c (modified) (view diffs)
• nic/ne2k/dp8390.h (modified) (view diffs)
• nic/ne2k/ne2k.c (modified) (view diffs)
• nic/ne2k/ne2k.ma (modified) (view diffs)
• nic/rtl8139/Makefile (added)
• nic/rtl8139/defs.c (added)
• nic/rtl8139/defs.h (added)
• nic/rtl8139/driver.c (added)
• nic/rtl8139/driver.h (added)
• nic/rtl8139/general.c (added)
• nic/rtl8139/general.h (moved) (moved from uspace/lib/c/include/ipc/arp.h ) (view diffs)
• nic/rtl8139/rtl8139.ma (added)
• test/test1/test1.c (modified) (view diffs)
• test/test2/test2.c (modified) (view diffs)
• test/test3/test3.c (modified) (view diffs)