Changeset 243cb86 in mainline

Timestamp:

2010-12-12T10:50:19Z (14 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

8365533

Parents:

101ef25c (diff), ebb98c5 (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 from development + several changes to hid driver.

Changes to hid driver:

• copied some code to usbkbd_get_descriptors() function
• base structure for hid descriptor and report parser (files uspace/lib/usb/include/usb/classes/hidparser.h

and uspace/lib/usb/src/hidparser.c)

Files:

• .bzrignore (modified) (view diffs)
• HelenOS.config (modified) (view diffs)
• Makefile (modified) (view diffs)
• boot/Makefile.common (modified) (view diffs)
• boot/arch/amd64/Makefile.inc (modified) (view diffs)
• boot/arch/mips32/include/arch.h (modified) (view diffs)
• contrib/conf/msim.conf (modified) (view diffs)
• kernel/arch/mips32/src/exception.c (modified) (view diffs)
• kernel/arch/mips32/src/smp/dorder.c (modified) (view diffs)
• tools/config.py (modified) (view diffs)
• uspace/Makefile (modified) (view diffs)
• uspace/app/netecho/print_error.c (modified) (view diffs)
• uspace/app/tester/Makefile (modified) (view diffs)
• uspace/app/tester/adt/usbaddrkeep.c (added)
• uspace/app/tester/adt/usbaddrkeep.def (added)
• uspace/app/tester/tester.c (modified) (view diffs)
• uspace/app/tester/tester.h (modified) (view diffs)
• uspace/app/usbinfo/Makefile (added)
• uspace/app/usbinfo/dump.c (added)
• uspace/app/usbinfo/main.c (added)
• uspace/app/usbinfo/usbinfo.h (added)
• uspace/app/virtusbkbd/virtusbkbd.c (modified) (view diffs)
• uspace/drv/isa/isa.c (modified) (view diffs)
• uspace/drv/ns8250/ns8250.c (modified) (view diffs)
• uspace/drv/pciintel/pci.c (modified) (view diffs)
• uspace/drv/root/root.c (modified) (view diffs)
• uspace/drv/rootia32/rootia32.ma (deleted)
• uspace/drv/rootpc/Makefile (moved) (moved from uspace/drv/rootia32/Makefile ) (view diffs)
• uspace/drv/rootpc/rootpc.c (moved) (moved from uspace/drv/rootia32/rootia32.c ) (view diffs)
• uspace/drv/rootpc/rootpc.ma (added)
• uspace/drv/rootvirt/Makefile (added)
• uspace/drv/rootvirt/devices.def (added)
• uspace/drv/rootvirt/rootvirt.c (added)
• uspace/drv/rootvirt/rootvirt.ma (added)
• uspace/drv/test1/Makefile (added)
• uspace/drv/test1/test1.c (added)
• uspace/drv/test1/test1.ma (added)
• uspace/drv/test2/Makefile (added)
• uspace/drv/test2/test2.c (added)
• uspace/drv/test2/test2.ma (added)
• uspace/drv/uhci/Makefile (modified) (view diffs)
• uspace/drv/uhci/main.c (modified) (view diffs)
• uspace/drv/uhci/transfers.c (added)
• uspace/drv/uhci/uhci.h (added)
• uspace/drv/uhci/uhci.ma (modified) (view diffs)
• uspace/drv/usbhub/Makefile (added)
• uspace/drv/usbhub/main.c (added)
• uspace/drv/usbhub/usbhub.h (added)
• uspace/drv/usbhub/usbhub.ma (added)
• uspace/drv/usbhub/utils.c (moved) (moved from uspace/lib/usb/src/hubdrv.c ) (view diffs)
• uspace/drv/usbkbd/main.c (modified) (view diffs)
• uspace/drv/vhc/conn.h (modified) (view diffs)
• uspace/drv/vhc/connhost.c (modified) (view diffs)
• uspace/drv/vhc/debug.c (modified) (view diffs)
• uspace/drv/vhc/hcd.c (modified) (view diffs)
• uspace/drv/vhc/hub.c (modified) (view diffs)
• uspace/drv/vhc/hub.h (modified) (view diffs)
• uspace/drv/vhc/vhc.ma (modified) (view diffs)
• uspace/drv/vhc/vhcd.h (modified) (view diffs)
• uspace/lib/block/libblock.c (modified) (view diffs)
• uspace/lib/block/libblock.h (modified) (view diffs)
• uspace/lib/c/generic/adt/char_map.c (modified) (view diffs)
• uspace/lib/c/generic/devman.c (modified) (view diffs)
• uspace/lib/c/include/adt/generic_field.h (modified) (view diffs)
• uspace/lib/c/include/errno.h (modified) (view diffs)
• uspace/lib/c/include/ipc/dev_iface.h (modified) (view diffs)
• uspace/lib/c/include/ipc/vfs.h (modified) (view diffs)
• uspace/lib/drv/generic/driver.c (modified) (view diffs)
• uspace/lib/drv/generic/remote_usbhc.c (modified) (view diffs)
• uspace/lib/drv/include/driver.h (modified) (view diffs)
• uspace/lib/drv/include/usbhc_iface.h (modified) (view diffs)
• uspace/lib/usb/Makefile (modified) (view diffs)
• uspace/lib/usb/include/usb/classes/hid.h (modified) (view diffs)
• uspace/lib/usb/include/usb/classes/hidparser.h (added)
• uspace/lib/usb/include/usb/debug.h (added)
• uspace/lib/usb/include/usb/devreq.h (modified) (view diffs)
• uspace/lib/usb/include/usb/hcd.h (added)
• uspace/lib/usb/include/usb/hcdhubd.h (modified) (view diffs)
• uspace/lib/usb/include/usb/usb.h (modified) (view diffs)
• uspace/lib/usb/include/usb/usbdrv.h (modified) (view diffs)
• uspace/lib/usb/src/addrkeep.c (added)
• uspace/lib/usb/src/debug.c (added)
• uspace/lib/usb/src/drvpsync.c (added)
• uspace/lib/usb/src/hcdhubd.c (modified) (view diffs)
• uspace/lib/usb/src/hcdhubd_private.h (modified) (view diffs)
• uspace/lib/usb/src/hcdrv.c (modified) (view diffs)
• uspace/lib/usb/src/hidparser.c (added)
• uspace/lib/usb/src/localdrv.c (modified) (view diffs)
• uspace/lib/usb/src/remotedrv.c (modified) (view diffs)
• uspace/lib/usb/src/usbdrv.c (modified) (view diffs)
• uspace/lib/usb/src/usbdrvreq.c (added)
• uspace/lib/usbvirt/main.c (modified) (view diffs)
• uspace/srv/bd/file_bd/file_bd.c (modified) (view diffs)
• uspace/srv/devman/devman.c (modified) (view diffs)
• uspace/srv/devman/devman.h (modified) (view diffs)
• uspace/srv/devman/main.c (modified) (view diffs)
• uspace/srv/devman/match.c (modified) (view diffs)
• uspace/srv/fs/devfs/devfs.c (modified) (view diffs)
• uspace/srv/fs/fat/fat.c (modified) (view diffs)
• uspace/srv/fs/tmpfs/tmpfs.c (modified) (view diffs)
• uspace/srv/net/il/arp/arp.c (modified) (view diffs)
• uspace/srv/net/il/arp/arp.h (modified) (view diffs)
• uspace/srv/vfs/vfs.h (modified) (view diffs)
• uspace/srv/vfs/vfs_ops.c (modified) (view diffs)
• uspace/srv/vfs/vfs_register.c (modified) (view diffs)