Changes in / [37f7cfe:75732da] in mainline


Ignore:
Location:
uspace
Files:
12 added
11 deleted
7 edited

Legend:

Unmodified
Added
Removed

  • uspace/app/virtusbkbd/Makefile

    r37f7cfe r75732da  
    3333
    3434LIBS = $(LIBUSB_PREFIX)/libusb.a $(LIBUSBVIRT_PREFIX)/libusbvirt.a
    35 EXTRA_CFLAGS = -I$(LIBUSB_PREFIX)/include -I$(LIB_PREFIX) -I$(LIBDRV_PREFIX)/include
     35EXTRA_CFLAGS = -I$(LIBUSB_PREFIX)/include -I$(LIBUSBVIRT_PREFIX)/include -I$(LIBDRV_PREFIX)/include
    3636
    3737SOURCES = \

  • uspace/app/virtusbkbd/stdreq.c

    r37f7cfe r75732da  
    3939#include "kbdconfig.h"
    4040
    41 static int on_get_descriptor(struct usbvirt_device *dev,
    42     usb_device_request_setup_packet_t *request, uint8_t *data);
    43 
    44 usbvirt_standard_device_request_ops_t standard_request_ops = {
    45         .on_get_status = NULL,
    46         .on_clear_feature = NULL,
    47         .on_set_feature = NULL,
    48         .on_set_address = NULL,
    49         .on_get_descriptor = on_get_descriptor,
    50         .on_set_descriptor = NULL,
    51         .on_get_configuration = NULL,
    52         .on_set_configuration = NULL,
    53         .on_get_interface = NULL,
    54         .on_set_interface = NULL,
    55         .on_synch_frame = NULL
    56 };
    57 
    58 
    59 static int on_get_descriptor(struct usbvirt_device *dev,
     41int stdreq_on_get_descriptor(struct usbvirt_device *dev,
    6042    usb_device_request_setup_packet_t *request, uint8_t *data)
    6143{

  • uspace/app/virtusbkbd/stdreq.h

    r37f7cfe r75732da  
    3838#include <usbvirt/device.h>
    3939
    40 extern usbvirt_standard_device_request_ops_t standard_request_ops;
     40int stdreq_on_get_descriptor(usbvirt_device_t *,
     41    usb_device_request_setup_packet_t *, uint8_t *);
    4142
    4243#endif

  • uspace/app/virtusbkbd/virtusbkbd.c

    r37f7cfe r75732da  
    143143 */
    144144static usbvirt_device_ops_t keyboard_ops = {
    145         .standard_request_ops = &standard_request_ops,
     145        .on_standard_request[USB_DEVREQ_GET_DESCRIPTOR]
     146            = stdreq_on_get_descriptor,
    146147        .on_class_device_request = on_class_request,
    147148        .on_data = on_incoming_data,

  • uspace/drv/vhc/Makefile

    r37f7cfe r75732da  
    3333        $(LIBDRV_PREFIX)/libdrv.a
    3434EXTRA_CFLAGS += \
    35         -I$(LIB_PREFIX) \
     35        -I$(LIBUSBVIRT_PREFIX)/include \
    3636        -I$(LIBUSB_PREFIX)/include \
    3737        -I$(LIBDRV_PREFIX)/include

  • uspace/drv/vhc/hubops.c

    r37f7cfe r75732da  
    7070static void set_port_state_nl(hub_port_t *, hub_port_state_t);
    7171
    72 /** Standard USB requests. */
    73 static usbvirt_standard_device_request_ops_t standard_request_ops = {
    74         .on_get_status = NULL,
    75         .on_clear_feature = NULL,
    76         .on_set_feature = NULL,
    77         .on_set_address = NULL,
    78         .on_get_descriptor = on_get_descriptor,
    79         .on_set_descriptor = NULL,
    80         .on_get_configuration = NULL,
    81         .on_set_configuration = on_set_configuration,
    82         .on_get_interface = NULL,
    83         .on_set_interface = NULL,
    84         .on_synch_frame = NULL
    85 };
    86 
    8772/** Hub operations. */
    8873usbvirt_device_ops_t hub_ops = {
    89         .standard_request_ops = &standard_request_ops,
     74        .on_standard_request[USB_DEVREQ_GET_DESCRIPTOR] = on_get_descriptor,
     75        .on_standard_request[USB_DEVREQ_SET_CONFIGURATION] = on_set_configuration,
    9076        .on_class_device_request = on_class_request,
    9177        .on_data = NULL,

  • uspace/lib/usbvirt/Makefile

    r37f7cfe r75732da  
    3131
    3232LIBS = $(LIBUSB_PREFIX)/libusb.a
    33 EXTRA_CFLAGS = -I$(LIBUSB_PREFIX)/include
     33EXTRA_CFLAGS = -I$(LIBUSB_PREFIX)/include -Iinclude
    3434
    3535SOURCES = \
    36         callback.c \
    37         ctrlpipe.c \
    38         debug.c \
    39         main.c \
    40         stdreq.c \
    41         transaction.c
     36        src/callback.c \
     37        src/ctrlpipe.c \
     38        src/debug.c \
     39        src/main.c \
     40        src/stdreq.c \
     41        src/transaction.c
    4242
    4343include $(USPACE_PREFIX)/Makefile.common
Note: See TracChangeset for help on using the changeset viewer.