Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset 0c05496 in mainline


Ignore:
Timestamp:
2010-12-12T13:46:21Z (11 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master
Children:
1f3158c, a822cd8, b666608
Parents:
e7b9541 (diff), 7ed5b576 (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 vojtechhorky/ - child device registration

The changes are mostly about wrapper for adding USB child device.

Location:
uspace
Files:
2 added
6 edited

Legend:

Unmodified
Added
Removed
  • uspace/app/usbinfo/dump.c

    re7b9541 r0c05496  
    6969}
    7070
     71void dump_match_ids(match_id_list_t *matches)
     72{
     73        printf("Match ids:\n");
     74        link_t *link;
     75        for (link = matches->ids.next;
     76            link != &matches->ids;
     77            link = link->next) {
     78                match_id_t *match = list_get_instance(link, match_id_t, link);
     79
     80                printf(INDENT "%d %s\n", match->score, match->id);
     81        }
     82}
     83
    7184void dump_standard_device_descriptor(usb_standard_device_descriptor_t *d)
    7285{
  • uspace/app/usbinfo/main.c

    re7b9541 r0c05496  
    112112
    113113        /*
     114         * Dump information about possible match ids.
     115         */
     116        match_id_list_t match_id_list;
     117        init_match_ids(&match_id_list);
     118        rc = usb_drv_create_device_match_ids(hc_phone, &match_id_list, address);
     119        if (rc != EOK) {
     120                fprintf(stderr,
     121                    NAME ": failed to fetch match ids of the device: %s.\n",
     122                    str_error(rc));
     123                return rc;
     124        }
     125        dump_match_ids(&match_id_list);
     126
     127        /*
    114128         * Get device descriptor and dump it.
    115129         */
  • uspace/app/usbinfo/usbinfo.h

    re7b9541 r0c05496  
    3939#include <usb/descriptor.h>
    4040#include <usb/debug.h>
     41#include <ipc/devman.h>
    4142
    4243
     
    4445
    4546void dump_buffer(const char *, const uint8_t *, size_t);
     47void dump_match_ids(match_id_list_t *matches);
    4648void dump_standard_device_descriptor(usb_standard_device_descriptor_t *);
    4749void dump_standard_configuration_descriptor(int,
  • uspace/lib/usb/Makefile

    re7b9541 r0c05496  
    3434SOURCES = \
    3535        src/addrkeep.c \
     36        src/class.c \
    3637        src/debug.c \
    3738        src/drvpsync.c \
     
    4041        src/hidparser.c \
    4142        src/localdrv.c \
     43        src/recognise.c \
    4244        src/remotedrv.c \
    4345        src/usb.c \
  • uspace/lib/usb/include/usb/classes/classes.h

    re7b9541 r0c05496  
    6060} usb_class_t;
    6161
     62const char *usb_str_class(usb_class_t);
    6263
    6364#endif
  • uspace/lib/usb/include/usb/usbdrv.h

    re7b9541 r0c05496  
    9494int usb_drv_async_wait_for(usb_handle_t);
    9595
     96int usb_drv_create_device_match_ids(int, match_id_list_t *, usb_address_t);
     97int usb_drv_register_child_in_devman(int, device_t *, usb_address_t,
     98    devman_handle_t *);
     99
    96100
    97101#endif
Note: See TracChangeset for help on using the changeset viewer.