| Index: device/gamepad/gamepad_standard_mappings_linux.cc
|
| diff --git a/content/browser/gamepad/gamepad_standard_mappings_linux.cc b/device/gamepad/gamepad_standard_mappings_linux.cc
|
| similarity index 90%
|
| rename from content/browser/gamepad/gamepad_standard_mappings_linux.cc
|
| rename to device/gamepad/gamepad_standard_mappings_linux.cc
|
| index ecff74b3723cfde4ce53ea1c1dceab0dabcd486b..7755e1f936debddac6d0b81ec76826c16a226175 100644
|
| --- a/content/browser/gamepad/gamepad_standard_mappings_linux.cc
|
| +++ b/device/gamepad/gamepad_standard_mappings_linux.cc
|
| @@ -5,9 +5,9 @@
|
| #include <stddef.h>
|
|
|
| #include "base/macros.h"
|
| -#include "content/browser/gamepad/gamepad_standard_mappings.h"
|
| +#include "device/gamepad/gamepad_standard_mappings.h"
|
|
|
| -namespace content {
|
| +namespace device {
|
|
|
| namespace {
|
|
|
| @@ -130,7 +130,6 @@ void MapperIBuffalo(const blink::WebGamepad& input, blink::WebGamepad* mapped) {
|
| mapped->axesLength = 2;
|
| }
|
|
|
| -
|
| void MapperXGEAR(const blink::WebGamepad& input, blink::WebGamepad* mapped) {
|
| *mapped = input;
|
| mapped->buttons[BUTTON_INDEX_PRIMARY] = input.buttons[2];
|
| @@ -296,28 +295,28 @@ struct MappingData {
|
| const char* const product_id;
|
| GamepadStandardMappingFunction function;
|
| } AvailableMappings[] = {
|
| - // http://www.linux-usb.org/usb.ids
|
| - {"0079", "0006", MapperDragonRiseGeneric}, // DragonRise Generic USB
|
| - {"045e", "028e", MapperXInputStyleGamepad}, // Xbox 360 Wired
|
| - {"045e", "028f", MapperXInputStyleGamepad}, // Xbox 360 Wireless
|
| - {"045e", "0719", MapperXInputStyleGamepad}, // Xbox 360 Wireless
|
| - {"046d", "c21d", MapperXInputStyleGamepad}, // Logitech F310
|
| - {"046d", "c21e", MapperXInputStyleGamepad}, // Logitech F510
|
| - {"046d", "c21f", MapperXInputStyleGamepad}, // Logitech F710
|
| - {"054c", "0268", MapperPlaystationSixAxis}, // Playstation SIXAXIS
|
| - {"054c", "05c4", MapperDualshock4}, // Playstation Dualshock 4
|
| - {"0583", "2060", MapperIBuffalo}, // iBuffalo Classic
|
| - {"0925", "0005", MapperLakeviewResearch}, // SmartJoy PLUS Adapter
|
| - {"0925", "8866", MapperLakeviewResearch}, // WiseGroup MP-8866
|
| - {"0955", "7210", MapperNvShield}, // Nvidia Shield gamepad
|
| - {"0b05", "4500", MapperADT1}, // Nexus Player Controller
|
| - {"0e8f", "0003", MapperXGEAR}, // XFXforce XGEAR PS2 Controller
|
| - {"1532", "0900", MapperRazerServal}, // Razer Serval Controller
|
| - {"18d1", "2c40", MapperADT1}, // ADT-1 Controller
|
| - {"20d6", "6271", MapperMogaPro}, // Moga Pro Controller (HID mode)
|
| - {"2378", "1008", MapperOnLiveWireless}, // OnLive Controller (Bluetooth)
|
| - {"2378", "100a", MapperOnLiveWireless}, // OnLive Controller (Wired)
|
| - {"2836", "0001", MapperOUYA}, // OUYA Controller
|
| + // http://www.linux-usb.org/usb.ids
|
| + {"0079", "0006", MapperDragonRiseGeneric}, // DragonRise Generic USB
|
| + {"045e", "028e", MapperXInputStyleGamepad}, // Xbox 360 Wired
|
| + {"045e", "028f", MapperXInputStyleGamepad}, // Xbox 360 Wireless
|
| + {"045e", "0719", MapperXInputStyleGamepad}, // Xbox 360 Wireless
|
| + {"046d", "c21d", MapperXInputStyleGamepad}, // Logitech F310
|
| + {"046d", "c21e", MapperXInputStyleGamepad}, // Logitech F510
|
| + {"046d", "c21f", MapperXInputStyleGamepad}, // Logitech F710
|
| + {"054c", "0268", MapperPlaystationSixAxis}, // Playstation SIXAXIS
|
| + {"054c", "05c4", MapperDualshock4}, // Playstation Dualshock 4
|
| + {"0583", "2060", MapperIBuffalo}, // iBuffalo Classic
|
| + {"0925", "0005", MapperLakeviewResearch}, // SmartJoy PLUS Adapter
|
| + {"0925", "8866", MapperLakeviewResearch}, // WiseGroup MP-8866
|
| + {"0955", "7210", MapperNvShield}, // Nvidia Shield gamepad
|
| + {"0b05", "4500", MapperADT1}, // Nexus Player Controller
|
| + {"0e8f", "0003", MapperXGEAR}, // XFXforce XGEAR PS2 Controller
|
| + {"1532", "0900", MapperRazerServal}, // Razer Serval Controller
|
| + {"18d1", "2c40", MapperADT1}, // ADT-1 Controller
|
| + {"20d6", "6271", MapperMogaPro}, // Moga Pro Controller (HID mode)
|
| + {"2378", "1008", MapperOnLiveWireless}, // OnLive Controller (Bluetooth)
|
| + {"2378", "100a", MapperOnLiveWireless}, // OnLive Controller (Wired)
|
| + {"2836", "0001", MapperOUYA}, // OUYA Controller
|
| };
|
|
|
| } // namespace
|
| @@ -333,4 +332,4 @@ GamepadStandardMappingFunction GetGamepadStandardMappingFunction(
|
| return NULL;
|
| }
|
|
|
| -} // namespace content
|
| +} // namespace device
|
|
|