Changeset 26e7d6d in mainline for uspace/app/mkbd/main.c


Ignore:
Timestamp:
2011-09-19T16:31:00Z (13 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
a347a11
Parents:
3842a955 (diff), 086290d (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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/app/mkbd/main.c

    r3842a955 r26e7d6d  
    4343#include <getopt.h>
    4444#include <devman.h>
    45 #include <devmap.h>
     45#include <loc.h>
    4646#include <usb/dev/hub.h>
    4747#include <usb/hid/iface.h>
     
    240240       
    241241        char path[MAX_PATH_LENGTH];
    242         rc = devman_get_device_path(dev_handle, path, MAX_PATH_LENGTH);
     242        rc = devman_fun_get_path(dev_handle, path, MAX_PATH_LENGTH);
    243243        if (rc != EOK) {
    244244                return ENOMEM;
     
    280280        size_t actual_size;
    281281        int event_nr;
    282 
     282       
    283283        while (true) {
    284284                /** @todo Try blocking call. */
Note: See TracChangeset for help on using the changeset viewer.