Ticket #6115: UsbHidDriver.diff

File UsbHidDriver.diff, 6.4 KB (added by x-ist, 14 years ago)

USB HID Driver adapted to the new names.

  • MouseDevice.cpp

     
    4040        if (!item->HasData())
    4141            continue;
    4242
    43         if (item->UsagePage() == HID_USAGE_PAGE_BUTTON
     43        if (item->UsagePage() == B_HID_USAGE_PAGE_BUTTON
    4444            && item->UsageID() - 1 < B_MAX_MOUSE_BUTTONS)
    4545            fButtons[buttonCount++] = item;
    4646    }
    4747
    4848    fButtons[buttonCount] = NULL;
    4949
    50     fWheel = report->FindItem(HID_USAGE_PAGE_GENERIC_DESKTOP,
    51         HID_USAGE_ID_WHEEL);
     50    fWheel = report->FindItem(B_HID_USAGE_PAGE_GENERIC_DESKTOP,
     51        B_HID_UID_GD_WHEEL);
    5252
    5353    TRACE("mouse device with %lu buttons and %swheel\n", buttonCount,
    5454        fWheel == NULL ? "no " : "");
    … …  
    6060MouseDevice::AddHandler(HIDDevice *device, HIDReport *report)
    6161{
    6262    // try to find at least an x and y axis
    63     HIDReportItem *xAxis = report->FindItem(HID_USAGE_PAGE_GENERIC_DESKTOP,
    64         HID_USAGE_ID_X);
     63    HIDReportItem *xAxis = report->FindItem(B_HID_USAGE_PAGE_GENERIC_DESKTOP,
     64        B_HID_UID_GD_X);
    6565    if (xAxis == NULL)
    6666        return NULL;
    6767
    68     HIDReportItem *yAxis = report->FindItem(HID_USAGE_PAGE_GENERIC_DESKTOP,
    69         HID_USAGE_ID_Y);
     68    HIDReportItem *yAxis = report->FindItem(B_HID_USAGE_PAGE_GENERIC_DESKTOP,
     69        B_HID_UID_GD_Y);
    7070    if (yAxis == NULL)
    7171        return NULL;
    7272

  • KeyboardDevice.cpp

     
    7373        if (!item->HasData())
    7474            continue;
    7575
    76         if (item->UsagePage() == HID_USAGE_PAGE_KEYBOARD
    77             || item->UsagePage() == HID_USAGE_PAGE_CONSUMER
    78             || item->UsagePage() == HID_USAGE_PAGE_BUTTON) {
     76        if (item->UsagePage() == B_HID_USAGE_PAGE_KEYBOARD
     77            || item->UsagePage() == B_HID_USAGE_PAGE_CONSUMER
     78            || item->UsagePage() == B_HID_USAGE_PAGE_BUTTON) {
    7979            TRACE("keyboard item with usage %lx\n", item->UsageMinimum());
    8080
    8181            if (item->Array()) {
    … …  
    8383                if (fKeyCount < MAX_KEYS)
    8484                    fKeys[fKeyCount++] = item;
    8585            } else {
    86                 if (item->UsagePage() == HID_USAGE_PAGE_KEYBOARD
    87                     && item->UsageID() >= HID_USAGE_ID_LEFT_CONTROL
    88                     && item->UsageID() <= HID_USAGE_ID_RIGHT_GUI) {
     86                if (item->UsagePage() == B_HID_USAGE_PAGE_KEYBOARD
     87                    && item->UsageID() >= B_HID_UID_KB_LEFT_CONTROL
     88                    && item->UsageID() <= B_HID_UID_KB_RIGHT_GUI) {
    8989                    // modifiers are generally implemented as bitmaps
    9090                    if (fModifierCount < MAX_MODIFIERS)
    9191                        fModifiers[fModifierCount++] = item;
    … …  
    118118
    119119            // the led item array is identity mapped with what we get from
    120120            // the input_server for the set-leds command
    121             if (item->UsagePage() == HID_USAGE_PAGE_LED) {
     121            if (item->UsagePage() == B_HID_USAGE_PAGE_LED) {
    122122                switch (item->UsageID()) {
    123                     case HID_USAGE_ID_LED_NUM_LOCK:
     123                    case B_HID_UID_LED_NUM_LOCK:
    124124                        fLEDs[0] = item;
    125125                        break;
    126                     case HID_USAGE_ID_LED_CAPS_LOCK:
     126                    case B_HID_UID_LED_CAPS_LOCK:
    127127                        fLEDs[1] = item;
    128128                        break;
    129                     case HID_USAGE_ID_LED_SCROLL_LOCK:
     129                    case B_HID_UID_LED_SCROLL_LOCK:
    130130                        fLEDs[2] = item;
    131131                        break;
    132132                }
    … …  
    165165        if (!item->HasData())
    166166            continue;
    167167
    168         if (item->UsagePage() == HID_USAGE_PAGE_KEYBOARD
    169             || (item->UsagePage() == HID_USAGE_PAGE_CONSUMER && item->Array())
    170             || (item->UsagePage() == HID_USAGE_PAGE_BUTTON && item->Array())) {
     168        if (item->UsagePage() == B_HID_USAGE_PAGE_KEYBOARD
     169            || (item->UsagePage() == B_HID_USAGE_PAGE_CONSUMER && item->Array())
     170            || (item->UsagePage() == B_HID_USAGE_PAGE_BUTTON && item->Array())) {
    171171            // found at least one item with a keyboard usage or with
    172172            // a consumer/button usage that is handled like a key
    173             mayHaveOutput = item->UsagePage() == HID_USAGE_PAGE_KEYBOARD;
     173            mayHaveOutput = item->UsagePage() == B_HID_USAGE_PAGE_KEYBOARD;
    174174            foundKeyboardUsage = true;
    175175            break;
    176176        }
    … …  
    190190
    191191            for (uint32 j = 0; j < output->CountItems(); j++) {
    192192                HIDReportItem *item = output->ItemAt(j);
    193                 if (item->UsagePage() == HID_USAGE_PAGE_LED) {
     193                if (item->UsagePage() == B_HID_USAGE_PAGE_LED) {
    194194                    foundOutputReport = true;
    195195                    break;
    196196                }
    … …  
    405405
    406406        if (modifier->Extract() == B_OK && modifier->Valid()) {
    407407            modifiers |= (modifier->Data() & 1)
    408                 << (modifier->UsageID() - HID_USAGE_ID_LEFT_CONTROL);
     408                << (modifier->UsageID() - B_HID_UID_KB_LEFT_CONTROL);
    409409        }
    410410    }
    411411
    … …  
    591591    bool phantomState = true;
    592592    for (size_t i = 0; i < fKeyCount; i++) {
    593593        if (fCurrentKeys[i] != 1
    594             || fKeys[i]->UsagePage() != HID_USAGE_PAGE_KEYBOARD) {
     594            || fKeys[i]->UsagePage() != B_HID_USAGE_PAGE_KEYBOARD) {
    595595            phantomState = false;
    596596            break;
    597597        }
    … …  
    613613    for (int32 twice = 0; twice < 2; twice++) {
    614614        for (size_t i = 0; i < fKeyCount; i++) {
    615615            if (current[i] == 0 || (current[i] == 1
    616                 && fKeys[i]->UsagePage() == HID_USAGE_PAGE_KEYBOARD))
     616                && fKeys[i]->UsagePage() == B_HID_USAGE_PAGE_KEYBOARD))
    617617                continue;
    618618
    619619            bool found = false;
    … …  
    629629
    630630            // a change occured
    631631            uint32 key = 0;
    632             if (fKeys[i]->UsagePage() == HID_USAGE_PAGE_KEYBOARD) {
     632            if (fKeys[i]->UsagePage() == B_HID_USAGE_PAGE_KEYBOARD) {
    633633                if (current[i] < kKeyTableSize)
    634634                    key = kKeyTable[current[i]];
    635635

  • HIDDevice.cpp

     
    4949    status_t result = gUSBModule->send_request(device,
    5050        USB_REQTYPE_INTERFACE_IN | USB_REQTYPE_STANDARD,
    5151        USB_REQUEST_GET_DESCRIPTOR,
    52         USB_HID_DESCRIPTOR_HID << 8, interfaceIndex, descriptorLength,
     52        B_USB_HID_DESCRIPTOR_HID << 8, interfaceIndex, descriptorLength,
    5353        hidDescriptor, &descriptorLength);
    5454
    5555    TRACE("get hid descriptor: result: 0x%08lx; length: %lu\n", result,
    … …  
    7070    result = gUSBModule->send_request(device,
    7171        USB_REQTYPE_INTERFACE_IN | USB_REQTYPE_STANDARD,
    7272        USB_REQUEST_GET_DESCRIPTOR,
    73         USB_HID_DESCRIPTOR_REPORT << 8, interfaceIndex, descriptorLength,
     73        B_USB_HID_DESCRIPTOR_REPORT << 8, interfaceIndex, descriptorLength,
    7474        reportDescriptor, &descriptorLength);
    7575
    7676    TRACE("get report descriptor: result: 0x%08lx; length: %lu\n", result,
    … …  
    215215    size_t actualLength;
    216216    return gUSBModule->send_request(fDevice,
    217217        USB_REQTYPE_INTERFACE_OUT | USB_REQTYPE_CLASS,
    218         USB_REQUEST_HID_SET_REPORT, 0x200 | report->ID(), fInterfaceIndex,
     218        B_USB_REQUEST_HID_SET_REPORT, 0x200 | report->ID(), fInterfaceIndex,
    219219        report->ReportSize(), report->CurrentReport(), &actualLength);
    220220}
    221221