Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/drv/usbhid/subdrivers.c

    rd3b6d5e r3a6e423  
    3838#include "usb/classes/hidpath.h"
    3939
    40 //#include "lgtch-ultrax/lgtch-ultrax.h"
    41 #include "multimedia/multimedia.h"
     40#include "lgtch-ultrax/lgtch-ultrax.h"
    4241#include "mouse/mousedev.h"
    4342
    4443static usb_hid_subdriver_usage_t path_kbd[] = {
    45         {USB_HIDUT_PAGE_GENERIC_DESKTOP,
    46          USB_HIDUT_USAGE_GENERIC_DESKTOP_KEYBOARD},
     44        {USB_HIDUT_PAGE_GENERIC_DESKTOP, USB_HIDUT_USAGE_GENERIC_DESKTOP_KEYBOARD},
    4745        {0, 0}
    4846};
    4947
    50 static usb_hid_subdriver_usage_t path_mouse[] = {
    51         {USB_HIDUT_PAGE_GENERIC_DESKTOP, USB_HIDUT_USAGE_GENERIC_DESKTOP_MOUSE},
     48static usb_hid_subdriver_usage_t path_mouse2[] = {
     49        {USB_HIDUT_PAGE_GENERIC_DESKTOP, USB_HIDUT_USAGE_GENERIC_DESKTOP_MOUSE}, 
    5250        {0, 0}
    5351};
    5452
    55 static usb_hid_subdriver_usage_t multim_key_path[] = {
    56         {USB_HIDUT_PAGE_CONSUMER, USB_HIDUT_USAGE_CONSUMER_CONSUMER_CONTROL},
     53static usb_hid_subdriver_usage_t lgtch_path[] = {
     54        {0xc, 0},
    5755        {0, 0}
    5856};
     
    6159        {
    6260                path_kbd,
    63                 -1,
    64                 USB_HID_PATH_COMPARE_ANYWHERE,
     61                0,
     62                USB_HID_PATH_COMPARE_BEGIN,
    6563                -1,
    6664                -1,
     
    7472        },
    7573        {
    76                 multim_key_path,
     74                lgtch_path,
    7775                1,
    78                 USB_HID_PATH_COMPARE_ANYWHERE,
    79                 -1,
    80                 -1,
     76                USB_HID_PATH_COMPARE_BEGIN
     77                | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY,         
     78                0x046d,
     79                0xc30e,
    8180                {
    82                         .init = usb_multimedia_init,
    83                         .deinit = usb_multimedia_deinit,
    84                         .poll = usb_multimedia_polling_callback,
     81                        .init = usb_lgtch_init,
     82                        .deinit = usb_lgtch_deinit,
     83                        .poll = usb_lgtch_polling_callback,
    8584                        .poll_end = NULL
    8685                }
    8786        },
    8887        {
    89                 path_mouse,
    90                 -1,
    91                 USB_HID_PATH_COMPARE_ANYWHERE,
     88                path_mouse2,
     89                0,
     90                USB_HID_PATH_COMPARE_BEGIN,
    9291                -1,
    9392                -1,
Note: See TracChangeset for help on using the changeset viewer.