Changeset 16dc887 in mainline for uspace/drv/bus/usb


Ignore:
Timestamp:
2011-08-16T14:00:32Z (14 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
278ac72, b112055
Parents:
3751a08 (diff), cc574511 (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 Location service.

Location:
uspace/drv/bus/usb
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • uspace/drv/bus/usb/usbhid/generic/hiddev.c

    r3751a08 r16dc887  
    192192static int usb_generic_hid_create_function(usb_hid_dev_t *hid_dev)
    193193{       
    194         /* Create the function exposed under /dev/devices. */
     194        /* Create the exposed function. */
    195195        /** @todo Generate numbers for the devices? */
    196196        usb_log_debug("Creating DDF function %s...\n", HID_GENERIC_FUN_NAME);

  • uspace/drv/bus/usb/usbhid/kbd/kbddev.c

    r3751a08 r16dc887  
    524524        assert(kbd_dev != NULL);
    525525       
    526         /* Create the function exposed under /dev/devices. */
     526        /* Create the exposed function. */
    527527        usb_log_debug("Creating DDF function %s...\n", HID_KBD_FUN_NAME);
    528528        ddf_fun_t *fun = ddf_fun_create(hid_dev->usb_dev->ddf_dev, fun_exposed,

  • uspace/drv/bus/usb/usbhid/mouse/mousedev.c

    r3751a08 r16dc887  
    325325        assert(mouse != NULL);
    326326       
    327         /* Create the function exposed under /dev/devices. */
     327        /* Create the exposed function. */
    328328        usb_log_debug("Creating DDF function %s...\n", HID_MOUSE_FUN_NAME);
    329329        ddf_fun_t *fun = ddf_fun_create(hid_dev->usb_dev->ddf_dev, fun_exposed,

  • uspace/drv/bus/usb/usbhid/multimedia/multimedia.c

    r3751a08 r16dc887  
    185185    usb_multimedia_t *multim_dev)
    186186{
    187         /* Create the function exposed under /dev/devices. */
     187        /* Create the exposed function. */
    188188        ddf_fun_t *fun = ddf_fun_create(hid_dev->usb_dev->ddf_dev, fun_exposed,
    189189            NAME);

  • uspace/drv/bus/usb/vhc/main.c

    r3751a08 r16dc887  
    3434 */
    3535
    36 #include <devmap.h>
     36#include <loc.h>
    3737#include <async.h>
    3838#include <unistd.h>
Note: See TracChangeset for help on using the changeset viewer.