Changeset 8ff0bd2 in mainline for uspace/drv/bus

Timestamp:

2011-09-04T11:30:58Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

03bc76a

Parents:

d2c67e7 (diff), deac215e (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

Location:

uspace/drv/bus

Files:

• isa/Makefile (moved) (moved from uspace/drv/isa/Makefile ) (view diffs)
• isa/isa.c (moved) (moved from uspace/drv/isa/isa.c ) (view diffs)
• isa/isa.dev (moved) (moved from uspace/drv/isa/isa.dev ) (view diffs)
• isa/isa.ma (moved) (moved from uspace/drv/isa/isa.ma ) (view diffs)
• pci/pciintel/Makefile (moved) (moved from uspace/drv/pciintel/Makefile ) (view diffs)
• pci/pciintel/pci.c (moved) (moved from uspace/drv/pciintel/pci.c ) (view diffs)
• pci/pciintel/pci.h (moved) (moved from uspace/drv/pciintel/pci.h ) (view diffs)
• pci/pciintel/pci_regs.h (moved) (moved from uspace/drv/pciintel/pci_regs.h ) (view diffs)
• pci/pciintel/pciintel.ma (moved) (moved from uspace/drv/pciintel/pciintel.ma ) (view diffs)
• usb/ehci/Makefile (moved) (moved from uspace/drv/ehci_hcd/Makefile ) (view diffs)
• usb/ehci/ehci.h (moved) (moved from uspace/drv/ehci_hcd/ehci.h ) (view diffs)
• usb/ehci/ehci.ma (moved) (moved from uspace/drv/ehci_hcd/ehci_hcd.ma ) (view diffs)
• usb/ehci/hc_iface.c (moved) (moved from uspace/drv/ehci_hcd/hc_iface.c ) (view diffs)
• usb/ehci/main.c (moved) (moved from uspace/drv/ehci_hcd/main.c ) (view diffs)
• usb/ehci/pci.c (moved) (moved from uspace/drv/ehci_hcd/pci.c ) (view diffs)
• usb/ehci/pci.h (moved) (moved from uspace/drv/ehci_hcd/pci.h ) (view diffs)
• usb/ohci/Makefile (moved) (moved from uspace/drv/ohci/Makefile ) (view diffs)
• usb/ohci/batch.c (moved) (moved from uspace/drv/ohci/batch.c ) (view diffs)
• usb/ohci/batch.h (moved) (moved from uspace/drv/ohci/batch.h ) (view diffs)
• usb/ohci/endpoint_list.c (moved) (moved from uspace/drv/ohci/endpoint_list.c ) (view diffs)
• usb/ohci/endpoint_list.h (moved) (moved from uspace/drv/ohci/endpoint_list.h ) (view diffs)
• usb/ohci/hc.c (moved) (moved from uspace/drv/ohci/hc.c ) (view diffs)
• usb/ohci/hc.h (moved) (moved from uspace/drv/ohci/hc.h ) (view diffs)
• usb/ohci/hcd_endpoint.c (moved) (moved from uspace/drv/ohci/hcd_endpoint.c ) (view diffs)
• usb/ohci/hcd_endpoint.h (moved) (moved from uspace/drv/ohci/hcd_endpoint.h ) (view diffs)
• usb/ohci/hw_struct/completion_codes.h (moved) (moved from uspace/drv/ohci/hw_struct/completion_codes.h ) (view diffs)
• usb/ohci/hw_struct/endpoint_descriptor.c (moved) (moved from uspace/drv/ohci/hw_struct/endpoint_descriptor.c ) (view diffs)
• usb/ohci/hw_struct/endpoint_descriptor.h (moved) (moved from uspace/drv/ohci/hw_struct/endpoint_descriptor.h ) (view diffs)
• usb/ohci/hw_struct/hcca.h (moved) (moved from uspace/drv/ohci/hw_struct/hcca.h ) (view diffs)
• usb/ohci/hw_struct/iso_transfer_descriptor.h (moved) (moved from uspace/drv/ohci/hw_struct/iso_transfer_descriptor.h ) (view diffs)
• usb/ohci/hw_struct/transfer_descriptor.c (moved) (moved from uspace/drv/ohci/hw_struct/transfer_descriptor.c ) (view diffs)
• usb/ohci/hw_struct/transfer_descriptor.h (moved) (moved from uspace/drv/ohci/hw_struct/transfer_descriptor.h ) (view diffs)
• usb/ohci/iface.c (moved) (moved from uspace/drv/ohci/iface.c ) (view diffs)
• usb/ohci/iface.h (moved) (moved from uspace/drv/ohci/iface.h ) (view diffs)
• usb/ohci/main.c (moved) (moved from uspace/drv/ohci/main.c ) (view diffs)
• usb/ohci/ohci.c (moved) (moved from uspace/drv/ohci/ohci.c ) (view diffs)
• usb/ohci/ohci.h (moved) (moved from uspace/drv/ohci/ohci.h ) (view diffs)
• usb/ohci/ohci.ma (moved) (moved from uspace/drv/ohci/ohci.ma ) (view diffs)
• usb/ohci/ohci_regs.h (moved) (moved from uspace/drv/ohci/ohci_regs.h ) (view diffs)
• usb/ohci/pci.c (moved) (moved from uspace/drv/ohci/pci.c ) (view diffs)
• usb/ohci/pci.h (moved) (moved from uspace/drv/ohci/pci.h ) (view diffs)
• usb/ohci/root_hub.c (added)
• usb/ohci/root_hub.h (moved) (moved from uspace/drv/ohci/root_hub.h ) (view diffs)
• usb/ohci/utils/malloc32.h (moved) (moved from uspace/drv/ohci/utils/malloc32.h ) (view diffs)
• usb/uhci/Makefile (moved) (moved from uspace/drv/uhci_hcd/Makefile ) (view diffs)
• usb/uhci/batch.c (moved) (moved from uspace/drv/uhci_hcd/batch.c ) (view diffs)
• usb/uhci/batch.h (moved) (moved from uspace/drv/uhci_hcd/batch.h ) (view diffs)
• usb/uhci/hc.c (moved) (moved from uspace/drv/uhci_hcd/hc.c ) (view diffs)
• usb/uhci/hc.h (moved) (moved from uspace/drv/uhci_hcd/hc.h ) (view diffs)
• usb/uhci/hw_struct/link_pointer.h (moved) (moved from uspace/drv/uhci_hcd/hw_struct/link_pointer.h ) (view diffs)
• usb/uhci/hw_struct/queue_head.h (moved) (moved from uspace/drv/uhci_hcd/hw_struct/queue_head.h ) (view diffs)
• usb/uhci/hw_struct/transfer_descriptor.c (moved) (moved from uspace/drv/uhci_hcd/hw_struct/transfer_descriptor.c ) (view diffs)
• usb/uhci/hw_struct/transfer_descriptor.h (moved) (moved from uspace/drv/uhci_hcd/hw_struct/transfer_descriptor.h ) (view diffs)
• usb/uhci/iface.c (moved) (moved from uspace/drv/uhci_hcd/iface.c ) (view diffs)
• usb/uhci/iface.h (moved) (moved from uspace/drv/uhci_hcd/iface.h ) (view diffs)
• usb/uhci/main.c (moved) (moved from uspace/drv/uhci_hcd/main.c ) (view diffs)
• usb/uhci/pci.c (moved) (moved from uspace/drv/uhci_hcd/pci.c ) (view diffs)
• usb/uhci/pci.h (moved) (moved from uspace/drv/uhci_hcd/pci.h ) (view diffs)
• usb/uhci/root_hub.c (moved) (moved from uspace/drv/uhci_hcd/root_hub.c ) (view diffs)
• usb/uhci/root_hub.h (moved) (moved from uspace/drv/uhci_hcd/root_hub.h ) (view diffs)
• usb/uhci/transfer_list.c (moved) (moved from uspace/drv/uhci_hcd/transfer_list.c ) (view diffs)
• usb/uhci/transfer_list.h (moved) (moved from uspace/drv/uhci_hcd/transfer_list.h ) (view diffs)
• usb/uhci/uhci.c (moved) (moved from uspace/drv/uhci_hcd/uhci.c ) (view diffs)
• usb/uhci/uhci.h (moved) (moved from uspace/drv/uhci_hcd/uhci.h ) (view diffs)
• usb/uhci/uhci.ma (moved) (moved from uspace/drv/uhci_hcd/uhci_hcd.ma ) (view diffs)
• usb/uhci/utils/malloc32.h (moved) (moved from uspace/drv/uhci_hcd/utils/malloc32.h ) (view diffs)
• usb/uhcirh/Makefile (moved) (moved from uspace/drv/uhci_rhd/Makefile ) (view diffs)
• usb/uhcirh/main.c (moved) (moved from uspace/drv/uhci_rhd/main.c ) (view diffs)
• usb/uhcirh/port.c (moved) (moved from uspace/drv/uhci_rhd/port.c ) (view diffs)
• usb/uhcirh/port.h (moved) (moved from uspace/drv/uhci_rhd/port.h ) (view diffs)
• usb/uhcirh/root_hub.c (moved) (moved from uspace/drv/uhci_rhd/root_hub.c ) (view diffs)
• usb/uhcirh/root_hub.h (moved) (moved from uspace/drv/uhci_rhd/root_hub.h ) (view diffs)
• usb/uhcirh/uhcirh.ma (moved) (moved from uspace/drv/uhci_rhd/uhci_rhd.ma ) (view diffs)
• usb/usbflbk/Makefile (moved) (moved from uspace/drv/usbflbk/Makefile ) (view diffs)
• usb/usbflbk/main.c (moved) (moved from uspace/drv/usbflbk/main.c ) (view diffs)
• usb/usbflbk/usbflbk.ma (moved) (moved from uspace/drv/usbflbk/usbflbk.ma ) (view diffs)
• usb/usbhid/Makefile (moved) (moved from uspace/drv/usbhid/Makefile ) (view diffs)
• usb/usbhid/generic/hiddev.c (moved) (moved from uspace/drv/usbhid/generic/hiddev.c ) (view diffs)
• usb/usbhid/generic/hiddev.h (moved) (moved from uspace/drv/usbhid/generic/hiddev.h ) (view diffs)
• usb/usbhid/kbd.h (moved) (moved from uspace/drv/usbhid/kbd.h ) (view diffs)
• usb/usbhid/kbd/conv.c (moved) (moved from uspace/drv/usbhid/kbd/conv.c ) (view diffs)
• usb/usbhid/kbd/conv.h (moved) (moved from uspace/drv/usbhid/kbd/conv.h ) (view diffs)
• usb/usbhid/kbd/kbddev.c (moved) (moved from uspace/drv/usbhid/kbd/kbddev.c ) (view diffs)
• usb/usbhid/kbd/kbddev.h (moved) (moved from uspace/drv/usbhid/kbd/kbddev.h ) (view diffs)
• usb/usbhid/kbd/kbdrepeat.c (moved) (moved from uspace/drv/usbhid/kbd/kbdrepeat.c ) (view diffs)
• usb/usbhid/kbd/kbdrepeat.h (moved) (moved from uspace/drv/usbhid/kbd/kbdrepeat.h ) (view diffs)
• usb/usbhid/kbd/layout.h (moved) (moved from uspace/drv/usbhid/kbd/layout.h ) (view diffs)
• usb/usbhid/kbd/main.c (moved) (moved from uspace/drv/usbhid/kbd/main.c ) (view diffs)
• usb/usbhid/layout.h (moved) (moved from uspace/drv/usbhid/layout.h ) (view diffs)
• usb/usbhid/main.c (moved) (moved from uspace/drv/usbhid/main.c ) (view diffs)
• usb/usbhid/mouse/mousedev.c (moved) (moved from uspace/drv/usbhid/mouse/mousedev.c ) (view diffs)
• usb/usbhid/mouse/mousedev.h (moved) (moved from uspace/drv/usbhid/mouse/mousedev.h ) (view diffs)
• usb/usbhid/multimedia/keymap.c (moved) (moved from uspace/drv/usbhid/multimedia/keymap.c ) (view diffs)
• usb/usbhid/multimedia/keymap.h (moved) (moved from uspace/drv/usbhid/multimedia/keymap.h ) (view diffs)
• usb/usbhid/multimedia/multimedia.c (moved) (moved from uspace/drv/usbhid/multimedia/multimedia.c ) (view diffs)
• usb/usbhid/multimedia/multimedia.h (moved) (moved from uspace/drv/usbhid/multimedia/multimedia.h ) (view diffs)
• usb/usbhid/subdrivers.c (moved) (moved from uspace/drv/usbhid/subdrivers.c ) (view diffs)
• usb/usbhid/subdrivers.h (moved) (moved from uspace/drv/usbhid/subdrivers.h ) (view diffs)
• usb/usbhid/usbhid.c (moved) (moved from uspace/drv/usbhid/usbhid.c ) (view diffs)
• usb/usbhid/usbhid.h (moved) (moved from uspace/drv/usbhid/usbhid.h ) (view diffs)
• usb/usbhid/usbhid.ma (moved) (moved from uspace/drv/usbhid/usbhid.ma ) (view diffs)
• usb/usbhub/Makefile (moved) (moved from uspace/drv/usbhub/Makefile ) (view diffs)
• usb/usbhub/main.c (moved) (moved from uspace/drv/usbhub/main.c ) (view diffs)
• usb/usbhub/port_status.h (moved) (moved from uspace/drv/usbhub/port_status.h ) (view diffs)
• usb/usbhub/ports.c (moved) (moved from uspace/drv/usbhub/ports.c ) (view diffs)
• usb/usbhub/ports.h (moved) (moved from uspace/drv/usbhub/ports.h ) (view diffs)
• usb/usbhub/usbhub.c (moved) (moved from uspace/drv/usbhub/usbhub.c ) (view diffs)
• usb/usbhub/usbhub.h (moved) (moved from uspace/drv/usbhub/usbhub.h ) (view diffs)
• usb/usbhub/usbhub.ma (moved) (moved from uspace/drv/usbhub/usbhub.ma ) (view diffs)
• usb/usbhub/usbhub_private.h (moved) (moved from uspace/drv/usbhub/usbhub_private.h ) (view diffs)
• usb/usbhub/utils.c (moved) (moved from uspace/drv/usbhub/utils.c ) (view diffs)
• usb/usbmast/Makefile (moved) (moved from uspace/drv/usbmast/Makefile ) (view diffs)
• usb/usbmast/bo_trans.c (added)
• usb/usbmast/bo_trans.h (added)
• usb/usbmast/cmdw.c (moved) (moved from uspace/drv/usbmast/cmds.h ) (view diffs)
• usb/usbmast/cmdw.h (added)
• usb/usbmast/main.c (added)
• usb/usbmast/scsi.h (moved) (moved from uspace/drv/usbmast/scsi.h ) (view diffs)
• usb/usbmast/scsi_ms.c (added)
• usb/usbmast/scsi_ms.h (moved) (moved from uspace/drv/usbmast/mast.h ) (view diffs)
• usb/usbmast/usbmast.h (added)
• usb/usbmast/usbmast.ma (moved) (moved from uspace/drv/usbmast/usbmast.ma ) (view diffs)
• usb/usbmid/Makefile (moved) (moved from uspace/drv/usbmid/Makefile ) (view diffs)
• usb/usbmid/dump.c (moved) (moved from uspace/drv/usbmid/dump.c ) (view diffs)
• usb/usbmid/explore.c (moved) (moved from uspace/drv/usbmid/explore.c ) (view diffs)
• usb/usbmid/main.c (moved) (moved from uspace/drv/usbmid/main.c ) (view diffs)
• usb/usbmid/usbmid.c (moved) (moved from uspace/drv/usbmid/usbmid.c ) (view diffs)
• usb/usbmid/usbmid.h (moved) (moved from uspace/drv/usbmid/usbmid.h ) (view diffs)
• usb/usbmid/usbmid.ma (moved) (moved from uspace/drv/usbmid/usbmid.ma ) (view diffs)
• usb/usbmouse/Makefile (moved) (moved from uspace/drv/usbmouse/Makefile ) (view diffs)
• usb/usbmouse/init.c (moved) (moved from uspace/drv/usbmouse/init.c ) (view diffs)
• usb/usbmouse/main.c (moved) (moved from uspace/drv/usbmouse/main.c ) (view diffs)
• usb/usbmouse/mouse.c (moved) (moved from uspace/drv/usbmouse/mouse.c ) (view diffs)
• usb/usbmouse/mouse.h (moved) (moved from uspace/drv/usbmouse/mouse.h ) (view diffs)
• usb/usbmouse/usbmouse.ma (moved) (moved from uspace/drv/usbmouse/usbmouse.ma ) (view diffs)
• usb/vhc/Makefile (moved) (moved from uspace/drv/vhc/Makefile ) (view diffs)
• usb/vhc/conn.h (moved) (moved from uspace/drv/vhc/conn.h ) (view diffs)
• usb/vhc/conndev.c (moved) (moved from uspace/drv/vhc/conndev.c ) (view diffs)
• usb/vhc/connhost.c (moved) (moved from uspace/drv/vhc/connhost.c ) (view diffs)
• usb/vhc/devconn.c (moved) (moved from uspace/drv/vhc/devconn.c ) (view diffs)
• usb/vhc/hub.c (moved) (moved from uspace/drv/vhc/hub.c ) (view diffs)
• usb/vhc/hub.h (moved) (moved from uspace/drv/vhc/hub.h ) (view diffs)
• usb/vhc/hub/hub.c (moved) (moved from uspace/drv/vhc/hub/hub.c ) (view diffs)
• usb/vhc/hub/hub.h (moved) (moved from uspace/drv/vhc/hub/hub.h ) (view diffs)
• usb/vhc/hub/virthub.c (moved) (moved from uspace/drv/vhc/hub/virthub.c ) (view diffs)
• usb/vhc/hub/virthub.h (moved) (moved from uspace/drv/vhc/hub/virthub.h ) (view diffs)
• usb/vhc/hub/virthubops.c (moved) (moved from uspace/drv/vhc/hub/virthubops.c ) (view diffs)
• usb/vhc/main.c (moved) (moved from uspace/drv/vhc/main.c ) (view diffs)
• usb/vhc/transfer.c (moved) (moved from uspace/drv/vhc/transfer.c ) (view diffs)
• usb/vhc/vhc.ma (moved) (moved from uspace/drv/vhc/vhc.ma ) (view diffs)
• usb/vhc/vhcd.h (moved) (moved from uspace/drv/vhc/vhcd.h ) (view diffs)