Skip to content

Commit

Permalink
USB: Remove joydev support
Browse files Browse the repository at this point in the history
  • Loading branch information
jackun committed Jul 10, 2021
1 parent c66314c commit b2f8062
Show file tree
Hide file tree
Showing 6 changed files with 2 additions and 766 deletions.
3 changes: 0 additions & 3 deletions pcsx2/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -403,8 +403,6 @@ set(pcsx2USBSources
USB/shared/ringbuffer.cpp
USB/icon_buzz_24.cpp
USB/usb-msd/usb-msd-gtk.cpp
USB/usb-pad/joydev/joydev.cpp
USB/usb-pad/joydev/joydev-gtk.cpp
USB/usb-pad/evdev/shared-gtk.cpp
USB/usb-pad/evdev/evdev-ff.cpp
USB/usb-pad/evdev/evdev.cpp
Expand Down Expand Up @@ -468,7 +466,6 @@ set(pcsx2USBHeaders
USB/linux/util.h
USB/gtk.h
USB/icon_buzz_24.h
USB/usb-pad/joydev/joydev.h
USB/usb-pad/evdev/shared.h
USB/usb-pad/evdev/evdev.h
USB/usb-pad/evdev/evdev-ff.h
Expand Down
2 changes: 0 additions & 2 deletions pcsx2/USB/usb-pad/api_init_linux.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,9 @@

#include "padproxy.h"
#include "evdev/evdev.h"
#include "joydev/joydev.h"

void usb_pad::RegisterPad::Register()
{
auto& inst = RegisterPad::instance();
inst.Add("evdev", new PadProxy<evdev::EvDevPad>());
inst.Add("joydev", new PadProxy<joydev::JoyDevPad>());
}
4 changes: 2 additions & 2 deletions pcsx2/USB/usb-pad/evdev/shared-gtk.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -540,7 +540,7 @@ namespace usb_pad

cfg.use_hidraw_ff_pt = false;
bool is_evdev = (strncmp(apiname, "evdev", 5) == 0);
if (is_evdev) //TODO idk about joydev
if (is_evdev)
{
LoadSetting(dev_type, port, apiname, N_HIDRAW_FF_PT, cfg.use_hidraw_ff_pt);
}
Expand Down Expand Up @@ -716,7 +716,7 @@ namespace usb_pad

std::stringstream str;
str << it.name;
if (!strcmp(apiname, "evdev") && !it.id.empty())
if (!it.id.empty())
str << " [" << it.id << "]";

gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(rs_cb), str.str().c_str());
Expand Down
178 changes: 0 additions & 178 deletions pcsx2/USB/usb-pad/joydev/joydev-gtk.cpp

This file was deleted.

Loading

0 comments on commit b2f8062

Please sign in to comment.