Changeset eb1a2f4 in mainline for uspace/app/tester


Ignore:
Timestamp:
2011-02-22T23:30:56Z (15 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
3b5d1535, a9c674e0
Parents:
dbe25f1 (diff), 664af708 (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 (DDF refactoring)

This merge includes DDF refactoring that brought multifunctional devices
(i.e. ddf_dev_t and ddf_fun_t). Please, see ticket #295 at HelenOS
upstream Trac.

The conflicts themselves were easy to solve (merely several renamings).

Changes to USB subsystem:

  • drivers uses ddf_dev_t and ddf_fun_t
  • different signatures of many library functions
  • several hacks around communication with parent device (now the communication is clearer and somehow what we have now is hack about other hacks)
    • will repair and clean later
  • maybe added some extra debugging messages (the diff has about 240K, and I admit I have no energy to double check that)

WARNING:

  • the diff is VERY long, recommended is viewing partial diffs of the merge (i.e. merges in mainline branch that lead to the parent one)
  • merging with your branches might involve huge renamings, sorry, no other way is possible

BUGS:

  • hub driver will not work (no function created)

GOOD NEWS:

  • QEMU keyboard seems to work with QEMU 0.13 and 0.14
  • we are up-to-date with mainline again
Location:
uspace/app/tester/hw
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • uspace/app/tester/hw/misc/virtchar1.c

    rdbe25f1 reb1a2f4  
    4747#include "../../tester.h"
    4848
    49 #define DEVICE_PATH_NORMAL "/dev/devices/\\virt\\null"
     49#define DEVICE_PATH_NORMAL "/dev/devices/\\virt\\null\\a"
    5050#define DEVICE_PATH_CLASSES "/dev/class/virt-null\\1"
    5151#define BUFFER_SIZE 64

  • uspace/app/tester/hw/serial/serial1.c

    rdbe25f1 reb1a2f4  
    7474       
    7575        devman_handle_t handle;
    76         res = devman_device_get_handle("/hw/pci0/00:01.0/com1", &handle,
     76        res = devman_device_get_handle("/hw/pci0/00:01.0/com1/a", &handle,
    7777            IPC_FLAG_BLOCKING);
    7878        if (res != EOK)
Note: See TracChangeset for help on using the changeset viewer.