From 7c0d91ce86cde92254073a1506926d0a0e7ceb96 Mon Sep 17 00:00:00 2001 From: arcum42 Date: Sat, 14 Nov 2009 09:02:10 +0000 Subject: [PATCH] Fix up Linux, as well as make a few minor changes to onepad. git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2196 96395faa-99c1-11dd-bbfe-3dabce05a288 --- common/include/Utilities/pxRadioPanel.h | 3 +- pcsx2/gui/wxHelpers.cpp | 2 +- plugins/onepad/Linux/OnePad.depend | 2230 ----------------------- plugins/onepad/Linux/gui.cpp | 5 +- plugins/onepad/Linux/linux.cpp | 2 +- plugins/onepad/analog.cpp | 2 +- plugins/onepad/controller.cpp | 2 +- plugins/onepad/controller.h | 4 +- plugins/onepad/onepad.cpp | 6 +- 9 files changed, 12 insertions(+), 2244 deletions(-) delete mode 100644 plugins/onepad/Linux/OnePad.depend diff --git a/common/include/Utilities/pxRadioPanel.h b/common/include/Utilities/pxRadioPanel.h index 2eece126b4..2e09575f75 100644 --- a/common/include/Utilities/pxRadioPanel.h +++ b/common/include/Utilities/pxRadioPanel.h @@ -18,6 +18,7 @@ #include #include "SafeArray.h" #include "wxGuiTools.h" +#include // -------------------------------------------------------------------------------------- // RadioPanelItem @@ -174,5 +175,5 @@ public: protected: void Init( const RadioPanelItem* srcArray=NULL, int arrsize=0 ); - void pxRadioPanel::_setToolTipImmediate( int idx, const wxString &tip ); + void _setToolTipImmediate( int idx, const wxString &tip ); }; diff --git a/pcsx2/gui/wxHelpers.cpp b/pcsx2/gui/wxHelpers.cpp index bc88d3981b..c97344b1a9 100644 --- a/pcsx2/gui/wxHelpers.cpp +++ b/pcsx2/gui/wxHelpers.cpp @@ -175,7 +175,7 @@ void wxDialogWithHelpers::AddOkCancel( wxSizer &sizer, bool hasApply ) // create a sizer to hold the help and ok/cancel buttons, for platforms // that need a custom help icon. [fixme: help icon prolly better off somewhere else] buttonSizer = new wxBoxSizer( wxHORIZONTAL ); - buttonSizer->Add( new wxContextHelpButton(this), wxHelpers::pxSizerFlags::StdButton().Align( wxALIGN_LEFT ) ); + buttonSizer->Add( new wxContextHelpButton(this), pxSizerFlags::StdButton().Align( wxALIGN_LEFT ) ); sizer.Add( buttonSizer, wxSizerFlags().Center() ); #endif } diff --git a/plugins/onepad/Linux/OnePad.depend b/plugins/onepad/Linux/OnePad.depend deleted file mode 100644 index de078ceb10..0000000000 --- a/plugins/onepad/Linux/OnePad.depend +++ /dev/null @@ -1,2230 +0,0 @@ -# depslib dependency file v1.0 -1251410353 source:/usr/local/src/pcsx2/plugins/onepad/Linux/gui.cpp - - - - "joystick.h" - "onepad.h" - "linux.h" - "interface.h" - "support.h" - "callbacks.h" - -1251387311 /usr/include/gtk-2.0/gtk/gtk.h - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -1251387304 /usr/include/gtk-2.0/gdk/gdk.h - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -1251387304 /usr/include/gtk-2.0/gdk/gdkapplaunchcontext.h - - - -1252047550 /usr/include/glib-2.0/gio/gio.h - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -1252047550 /usr/include/glib-2.0/gio/giotypes.h - - -1252047550 /usr/include/glib-2.0/gio/gioenums.h - - -1252047539 /usr/include/glib-2.0/glib-object.h - - - - - - - - - - - - - - -1252047546 /usr/include/glib-2.0/gobject/gboxed.h - - -1252047546 /usr/include/glib-2.0/gobject/gtype.h - - -1252047539 /usr/include/glib-2.0/glib.h - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -1252047539 /usr/include/glib-2.0/glib/galloca.h - - - - -1252047539 /usr/include/glib-2.0/glib/gtypes.h - - - -1252047538 /usr/lib/glib-2.0/include/glibconfig.h - - - - -1252047539 /usr/include/glib-2.0/glib/gmacros.h - - -1252047539 /usr/include/glib-2.0/glib/garray.h - - -1252047539 /usr/include/glib-2.0/glib/gasyncqueue.h - - -1252047539 /usr/include/glib-2.0/glib/gthread.h - - - - - -1252047539 /usr/include/glib-2.0/glib/gerror.h - - -1252047539 /usr/include/glib-2.0/glib/gquark.h - - -1252047539 /usr/include/glib-2.0/glib/gutils.h - - - -1252047539 /usr/include/glib-2.0/glib/gatomic.h - - -1252047539 /usr/include/glib-2.0/glib/gbacktrace.h - - - -1252047539 /usr/include/glib-2.0/glib/gbase64.h - - -1252047539 /usr/include/glib-2.0/glib/gbookmarkfile.h - - - -1252047539 /usr/include/glib-2.0/glib/gcache.h - - -1252047539 /usr/include/glib-2.0/glib/glist.h - - -1252047539 /usr/include/glib-2.0/glib/gmem.h - - - -1252047539 /usr/include/glib-2.0/glib/gslice.h - - -1252047539 /usr/include/glib-2.0/glib/gchecksum.h - - -1252047539 /usr/include/glib-2.0/glib/gcompletion.h - - -1252047539 /usr/include/glib-2.0/glib/gconvert.h - - -1252047539 /usr/include/glib-2.0/glib/gdataset.h - - -1252047539 /usr/include/glib-2.0/glib/gdate.h - - - - -1252047539 /usr/include/glib-2.0/glib/gdir.h - - -1252047539 /usr/include/glib-2.0/glib/gfileutils.h - - -1252047539 /usr/include/glib-2.0/glib/ghash.h - - - -1252047539 /usr/include/glib-2.0/glib/ghook.h - - -1252047539 /usr/include/glib-2.0/glib/giochannel.h - - - - -1252047539 /usr/include/glib-2.0/glib/gmain.h - - - - -1252047539 /usr/include/glib-2.0/glib/gpoll.h - - -1252047539 /usr/include/glib-2.0/glib/gslist.h - - -1252047539 /usr/include/glib-2.0/glib/gstring.h - - - - -1252047539 /usr/include/glib-2.0/glib/gunicode.h - - - -1252047539 /usr/include/glib-2.0/glib/gkeyfile.h - - -1252047539 /usr/include/glib-2.0/glib/gmappedfile.h - - -1252047539 /usr/include/glib-2.0/glib/gmarkup.h - - - - -1252047539 /usr/include/glib-2.0/glib/gmessages.h - - - - -1252047539 /usr/include/glib-2.0/glib/gnode.h - - -1252047539 /usr/include/glib-2.0/glib/goption.h - - - -1252047539 /usr/include/glib-2.0/glib/gpattern.h - - -1252047539 /usr/include/glib-2.0/glib/gprimes.h - - -1252047539 /usr/include/glib-2.0/glib/gqsort.h - - -1252047539 /usr/include/glib-2.0/glib/gqueue.h - - -1252047539 /usr/include/glib-2.0/glib/grand.h - - -1252047539 /usr/include/glib-2.0/glib/grel.h - - -1252047539 /usr/include/glib-2.0/glib/gregex.h - - - -1252047539 /usr/include/glib-2.0/glib/gscanner.h - - - -1252047539 /usr/include/glib-2.0/glib/gsequence.h - - -1252047539 /usr/include/glib-2.0/glib/gshell.h - - -1252047539 /usr/include/glib-2.0/glib/gspawn.h - - -1252047539 /usr/include/glib-2.0/glib/gstrfuncs.h - - - -1252047539 /usr/include/glib-2.0/glib/gtestutils.h - - -1252047539 /usr/include/glib-2.0/glib/gthreadpool.h - - -1252047539 /usr/include/glib-2.0/glib/gtimer.h - - -1252047539 /usr/include/glib-2.0/glib/gtree.h - - -1252047539 /usr/include/glib-2.0/glib/gurifuncs.h - - -1252047539 /usr/include/glib-2.0/glib/gwin32.h - - -1252047546 /usr/include/glib-2.0/gobject/genums.h - - -1252047546 /usr/include/glib-2.0/gobject/gobject.h - - - - - - -1252047546 /usr/include/glib-2.0/gobject/gvalue.h - - -1252047546 /usr/include/glib-2.0/gobject/gparam.h - - -1252047546 /usr/include/glib-2.0/gobject/gclosure.h - - -1252047546 /usr/include/glib-2.0/gobject/gsignal.h - - - - - -1252047546 /usr/include/glib-2.0/gobject/gmarshal.h - -1252047546 /usr/include/glib-2.0/gobject/gparamspecs.h - - - - - -1252047546 /usr/include/glib-2.0/gobject/gsourceclosure.h - - -1252047546 /usr/include/glib-2.0/gobject/gtypemodule.h - - - -1252047546 /usr/include/glib-2.0/gobject/gtypeplugin.h - - -1252047546 /usr/include/glib-2.0/gobject/gvaluearray.h - - -1252047546 /usr/include/glib-2.0/gobject/gvaluetypes.h - - -1252047550 /usr/include/glib-2.0/gio/gappinfo.h - - -1252047550 /usr/include/glib-2.0/gio/gasyncresult.h - - -1252047550 /usr/include/glib-2.0/gio/gbufferedinputstream.h - - -1252047550 /usr/include/glib-2.0/gio/gfilterinputstream.h - - -1252047550 /usr/include/glib-2.0/gio/ginputstream.h - - -1252047550 /usr/include/glib-2.0/gio/gbufferedoutputstream.h - - -1252047550 /usr/include/glib-2.0/gio/gfilteroutputstream.h - - -1252047550 /usr/include/glib-2.0/gio/goutputstream.h - - -1252047550 /usr/include/glib-2.0/gio/gcancellable.h - - -1252047550 /usr/include/glib-2.0/gio/gcontenttype.h - - -1252047550 /usr/include/glib-2.0/gio/gdatainputstream.h - - -1252047550 /usr/include/glib-2.0/gio/gdataoutputstream.h - - -1252047550 /usr/include/glib-2.0/gio/gdrive.h - - -1252047550 /usr/include/glib-2.0/gio/gemblemedicon.h - - - -1252047550 /usr/include/glib-2.0/gio/gicon.h - - -1252047550 /usr/include/glib-2.0/gio/gemblem.h - - -1252047550 /usr/include/glib-2.0/gio/gfile.h - - -1252047550 /usr/include/glib-2.0/gio/gfileattribute.h - - -1252047550 /usr/include/glib-2.0/gio/gfileenumerator.h - - -1252047550 /usr/include/glib-2.0/gio/gfileicon.h - - -1252047550 /usr/include/glib-2.0/gio/gfileinfo.h - - -1252047550 /usr/include/glib-2.0/gio/gfileinputstream.h - - -1252047550 /usr/include/glib-2.0/gio/gfilemonitor.h - - -1252047550 /usr/include/glib-2.0/gio/gfilenamecompleter.h - - -1252047550 /usr/include/glib-2.0/gio/gfileoutputstream.h - - -1252047550 /usr/include/glib-2.0/gio/gioenumtypes.h - - -1252047550 /usr/include/glib-2.0/gio/gioerror.h - - - -1252047550 /usr/include/glib-2.0/gio/giomodule.h - - - -1252047541 /usr/include/glib-2.0/gmodule.h - - -1252047550 /usr/include/glib-2.0/gio/gioscheduler.h - - -1252047550 /usr/include/glib-2.0/gio/gloadableicon.h - - -1252047550 /usr/include/glib-2.0/gio/gmemoryinputstream.h - - -1252047550 /usr/include/glib-2.0/gio/gmemoryoutputstream.h - - -1252047550 /usr/include/glib-2.0/gio/gmount.h - - -1252047550 /usr/include/glib-2.0/gio/gmountoperation.h - - -1252047550 /usr/include/glib-2.0/gio/gnativevolumemonitor.h - - -1252047550 /usr/include/glib-2.0/gio/gvolumemonitor.h - - -1252047550 /usr/include/glib-2.0/gio/gseekable.h - - -1252047550 /usr/include/glib-2.0/gio/gsimpleasyncresult.h - - -1252047550 /usr/include/glib-2.0/gio/gthemedicon.h - - -1252047550 /usr/include/glib-2.0/gio/gvfs.h - - -1252047550 /usr/include/glib-2.0/gio/gvolume.h - - -1251387304 /usr/include/gtk-2.0/gdk/gdkscreen.h - - "gdk/gdktypes.h" - "gdk/gdkdisplay.h" - -1251385979 /usr/include/cairo/cairo.h - "cairo-version.h" - "cairo-features.h" - "cairo-deprecated.h" - -1251385979 /usr/include/cairo/cairo-version.h - -1251385979 /usr/include/cairo/cairo-features.h - -1251385979 /usr/include/cairo/cairo-deprecated.h - -1251387304 /usr/include/gtk-2.0/gdk/gdktypes.h - - - - - -1251386057 /usr/include/pango-1.0/pango/pango.h - - - - - - - - - - - - - - - - - - - - - - - -1251386057 /usr/include/pango-1.0/pango/pango-attributes.h - - - -1251386057 /usr/include/pango-1.0/pango/pango-font.h - - - - -1251386057 /usr/include/pango-1.0/pango/pango-coverage.h - - -1251386057 /usr/include/pango-1.0/pango/pango-types.h - - - - - - - - -1251386057 /usr/include/pango-1.0/pango/pango-gravity.h - - - - -1251386057 /usr/include/pango-1.0/pango/pango-matrix.h - - - - -1251386057 /usr/include/pango-1.0/pango/pango-script.h - - - -1251386057 /usr/include/pango-1.0/pango/pango-language.h - - - - -1251386057 /usr/include/pango-1.0/pango/pango-bidi-type.h - - -1251386057 /usr/include/pango-1.0/pango/pango-break.h - - - -1251386057 /usr/include/pango-1.0/pango/pango-item.h - - -1251386057 /usr/include/pango-1.0/pango/pango-context.h - - - - -1251386057 /usr/include/pango-1.0/pango/pango-fontmap.h - - - -1251386057 /usr/include/pango-1.0/pango/pango-fontset.h - - - - -1251386057 /usr/include/pango-1.0/pango/pango-engine.h - - - - - - - -1251386057 /usr/include/pango-1.0/pango/pango-glyph.h - - - -1251386057 /usr/include/pango-1.0/pango/pango-enum-types.h - - -1251386057 /usr/include/pango-1.0/pango/pango-features.h - -1251386057 /usr/include/pango-1.0/pango/pango-glyph-item.h - - - - - -1251386057 /usr/include/pango-1.0/pango/pango-layout.h - - - - - -1251386057 /usr/include/pango-1.0/pango/pango-tabs.h - - -1251386057 /usr/include/pango-1.0/pango/pango-renderer.h - - -1251386057 /usr/include/pango-1.0/pango/pango-utils.h - - - - -1251387302 /usr/lib/gtk-2.0/include/gdkconfig.h - -1251387304 /usr/include/gtk-2.0/gdk/gdkdisplay.h - - - -1251387304 /usr/include/gtk-2.0/gdk/gdkevents.h - - - - - -1251387304 /usr/include/gtk-2.0/gdk/gdkcolor.h - - - -1251387304 /usr/include/gtk-2.0/gdk/gdkdnd.h - - -1251387304 /usr/include/gtk-2.0/gdk/gdkinput.h - - -1251387304 /usr/include/gtk-2.0/gdk/gdkcairo.h - - - - -1251387304 /usr/include/gtk-2.0/gdk/gdkpixbuf.h - - - - - -1251387304 /usr/include/gtk-2.0/gdk/gdkrgb.h - - -1251387295 /usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf.h - - - - - - - - - - - -1251387295 /usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-features.h - -1251387295 /usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-core.h - - - - -1251387295 /usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-transform.h - - - -1251387295 /usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-animation.h - - - -1251387295 /usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-simple-anim.h - - -1251387295 /usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-io.h - - - - - - -1251387295 /usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-loader.h - - - - - - -1251387295 /usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-enum-types.h - - -1251386057 /usr/include/pango-1.0/pango/pangocairo.h - - - -1251387304 /usr/include/gtk-2.0/gdk/gdkcursor.h - - - -1251387304 /usr/include/gtk-2.0/gdk/gdkdisplaymanager.h - - - -1251387304 /usr/include/gtk-2.0/gdk/gdkdrawable.h - - - - - - -1251387304 /usr/include/gtk-2.0/gdk/gdkgc.h - - - -1251387304 /usr/include/gtk-2.0/gdk/gdkenumtypes.h - - -1251387304 /usr/include/gtk-2.0/gdk/gdkfont.h - - - -1251387304 /usr/include/gtk-2.0/gdk/gdkimage.h - - -1251387304 /usr/include/gtk-2.0/gdk/gdkkeys.h - - -1251387304 /usr/include/gtk-2.0/gdk/gdkpango.h - - -1251387304 /usr/include/gtk-2.0/gdk/gdkpixmap.h - - - -1251387304 /usr/include/gtk-2.0/gdk/gdkproperty.h - - -1251387304 /usr/include/gtk-2.0/gdk/gdkregion.h - - -1251387304 /usr/include/gtk-2.0/gdk/gdkselection.h - - -1251387304 /usr/include/gtk-2.0/gdk/gdkspawn.h - - -1251387304 /usr/include/gtk-2.0/gdk/gdktestutils.h - - -1251387304 /usr/include/gtk-2.0/gdk/gdkwindow.h - - - - -1251387304 /usr/include/gtk-2.0/gdk/gdkvisual.h - - -1251387311 /usr/include/gtk-2.0/gtk/gtkaboutdialog.h - - -1251387312 /usr/include/gtk-2.0/gtk/gtkdialog.h - - -1251387313 /usr/include/gtk-2.0/gtk/gtkwindow.h - - - -1251387311 /usr/include/gtk-2.0/gtk/gtkaccelgroup.h - - - -1251387312 /usr/include/gtk-2.0/gtk/gtkenums.h - - -1251387311 /usr/include/gtk-2.0/gtk/gtkbin.h - - -1251387312 /usr/include/gtk-2.0/gtk/gtkcontainer.h - - - -1251387313 /usr/include/gtk-2.0/gtk/gtkwidget.h - - - - - - - - -1251387312 /usr/include/gtk-2.0/gtk/gtkobject.h - - - - - -1251387312 /usr/include/gtk-2.0/gtk/gtktypeutils.h - - -1251387313 /usr/include/gtk-2.0/gtk/gtktypebuiltins.h - - -1251387312 /usr/include/gtk-2.0/gtk/gtkdebug.h - - -1251387311 /usr/include/gtk-2.0/gtk/gtkadjustment.h - - - -1251387312 /usr/include/gtk-2.0/gtk/gtkstyle.h - - - -1251387312 /usr/include/gtk-2.0/gtk/gtksettings.h - - -1251387312 /usr/include/gtk-2.0/gtk/gtkrc.h - - -1251381964 /usr/include/atk-1.0/atk/atk.h - - - - - - - - - - - - - - - - - - - - - - - - - - - -1251381964 /usr/include/atk-1.0/atk/atkobject.h - - - - -1251381964 /usr/include/atk-1.0/atk/atkstate.h - - -1251381964 /usr/include/atk-1.0/atk/atkrelationtype.h - - -1251381964 /usr/include/atk-1.0/atk/atkaction.h - - -1251381964 /usr/include/atk-1.0/atk/atkcomponent.h - - - -1251381964 /usr/include/atk-1.0/atk/atkutil.h - - -1251381964 /usr/include/atk-1.0/atk/atkdocument.h - - - -1251381964 /usr/include/atk-1.0/atk/atkeditabletext.h - - - -1251381964 /usr/include/atk-1.0/atk/atktext.h - - - - -1251381964 /usr/include/atk-1.0/atk/atkgobjectaccessible.h - - -1251381964 /usr/include/atk-1.0/atk/atkhyperlink.h - - -1251381964 /usr/include/atk-1.0/atk/atkhyperlinkimpl.h - - - -1251381964 /usr/include/atk-1.0/atk/atkhypertext.h - - - -1251381964 /usr/include/atk-1.0/atk/atkimage.h - - - -1251381964 /usr/include/atk-1.0/atk/atknoopobject.h - -1251381964 /usr/include/atk-1.0/atk/atknoopobjectfactory.h - - -1251381964 /usr/include/atk-1.0/atk/atkobjectfactory.h - - - -1251381964 /usr/include/atk-1.0/atk/atkregistry.h - - "atkobjectfactory.h" - -1251381964 /usr/include/atk-1.0/atk/atkrelation.h - - - -1251381964 /usr/include/atk-1.0/atk/atkrelationset.h - - - - -1251381964 /usr/include/atk-1.0/atk/atkselection.h - - -1251381964 /usr/include/atk-1.0/atk/atkstateset.h - - - - -1251381964 /usr/include/atk-1.0/atk/atkstreamablecontent.h - - -1251381964 /usr/include/atk-1.0/atk/atktable.h - - -1251381964 /usr/include/atk-1.0/atk/atkmisc.h - - -1251381964 /usr/include/atk-1.0/atk/atkvalue.h - - -1251387311 /usr/include/gtk-2.0/gtk/gtkaccellabel.h - - -1251387312 /usr/include/gtk-2.0/gtk/gtklabel.h - - - - -1251387312 /usr/include/gtk-2.0/gtk/gtkmisc.h - - -1251387312 /usr/include/gtk-2.0/gtk/gtkmenu.h - - - -1251387312 /usr/include/gtk-2.0/gtk/gtkmenushell.h - - -1251387311 /usr/include/gtk-2.0/gtk/gtkaccelmap.h - - -1251387311 /usr/include/gtk-2.0/gtk/gtkaccessible.h - - - -1251387311 /usr/include/gtk-2.0/gtk/gtkaction.h - - -1251387311 /usr/include/gtk-2.0/gtk/gtkactiongroup.h - - - -1251387311 /usr/include/gtk-2.0/gtk/gtkactivatable.h - - - -1251387311 /usr/include/gtk-2.0/gtk/gtkalignment.h - - -1251387311 /usr/include/gtk-2.0/gtk/gtkarrow.h - - -1251387311 /usr/include/gtk-2.0/gtk/gtkaspectframe.h - - -1251387312 /usr/include/gtk-2.0/gtk/gtkframe.h - - -1251387311 /usr/include/gtk-2.0/gtk/gtkassistant.h - - -1251387311 /usr/include/gtk-2.0/gtk/gtkbbox.h - - -1251387311 /usr/include/gtk-2.0/gtk/gtkbox.h - - -1251387311 /usr/include/gtk-2.0/gtk/gtkbindings.h - - - -1251387311 /usr/include/gtk-2.0/gtk/gtkbuildable.h - - - -1251387311 /usr/include/gtk-2.0/gtk/gtkbuilder.h - - - -1251387311 /usr/include/gtk-2.0/gtk/gtkbutton.h - - - -1251387312 /usr/include/gtk-2.0/gtk/gtkimage.h - - - -1251387311 /usr/include/gtk-2.0/gtk/gtkcalendar.h - - - -1251387313 /usr/include/gtk-2.0/gtk/gtksignal.h - - - - - -1251387313 /usr/include/gtk-2.0/gtk/gtkmarshal.h - - -1251387311 /usr/include/gtk-2.0/gtk/gtkcelleditable.h - - -1251387311 /usr/include/gtk-2.0/gtk/gtkcelllayout.h - - - - - -1251387311 /usr/include/gtk-2.0/gtk/gtkcellrenderer.h - - -1251387312 /usr/include/gtk-2.0/gtk/gtktreeviewcolumn.h - - - - - -1251387312 /usr/include/gtk-2.0/gtk/gtktreemodel.h - - - -1251387312 /usr/include/gtk-2.0/gtk/gtktreesortable.h - - - -1251387311 /usr/include/gtk-2.0/gtk/gtkcellrendereraccel.h - - -1251387311 /usr/include/gtk-2.0/gtk/gtkcellrenderertext.h - - -1251387311 /usr/include/gtk-2.0/gtk/gtkcellrenderercombo.h - - - -1251387311 /usr/include/gtk-2.0/gtk/gtkcellrendererpixbuf.h - - -1251387311 /usr/include/gtk-2.0/gtk/gtkcellrendererprogress.h - - -1251387311 /usr/include/gtk-2.0/gtk/gtkcellrendererspin.h - - -1251387311 /usr/include/gtk-2.0/gtk/gtkcellrenderertoggle.h - - -1251387311 /usr/include/gtk-2.0/gtk/gtkcellview.h - - - - -1251387311 /usr/include/gtk-2.0/gtk/gtkcheckbutton.h - - -1251387312 /usr/include/gtk-2.0/gtk/gtktogglebutton.h - - -1251387311 /usr/include/gtk-2.0/gtk/gtkcheckmenuitem.h - - -1251387312 /usr/include/gtk-2.0/gtk/gtkmenuitem.h - - -1251387312 /usr/include/gtk-2.0/gtk/gtkitem.h - - -1251387311 /usr/include/gtk-2.0/gtk/gtkclipboard.h - - -1251387312 /usr/include/gtk-2.0/gtk/gtkselection.h - - - -1251387312 /usr/include/gtk-2.0/gtk/gtktextiter.h - - - -1251387312 /usr/include/gtk-2.0/gtk/gtktexttag.h - - - - -1251387312 /usr/include/gtk-2.0/gtk/gtktextchild.h - - - -1251387311 /usr/include/gtk-2.0/gtk/gtkcolorbutton.h - - -1251387311 /usr/include/gtk-2.0/gtk/gtkcolorsel.h - - - -1251387312 /usr/include/gtk-2.0/gtk/gtkvbox.h - - -1251387312 /usr/include/gtk-2.0/gtk/gtkcolorseldialog.h - - - - -1251387312 /usr/include/gtk-2.0/gtk/gtkcombobox.h - - - - -1251387312 /usr/include/gtk-2.0/gtk/gtktreeview.h - - - - - - -1251387312 /usr/include/gtk-2.0/gtk/gtkdnd.h - - - -1251387312 /usr/include/gtk-2.0/gtk/gtkentry.h - - - - - - - -1251387312 /usr/include/gtk-2.0/gtk/gtkeditable.h - - -1251387312 /usr/include/gtk-2.0/gtk/gtkimcontext.h - - - -1251387312 /usr/include/gtk-2.0/gtk/gtkentrycompletion.h - - - - - -1251387312 /usr/include/gtk-2.0/gtk/gtkliststore.h - - - - -1251387312 /usr/include/gtk-2.0/gtk/gtktreemodelfilter.h - - - -1251387312 /usr/include/gtk-2.0/gtk/gtkcomboboxentry.h - - - -1251387312 /usr/include/gtk-2.0/gtk/gtkcurve.h - - -1251387312 /usr/include/gtk-2.0/gtk/gtkdrawingarea.h - - -1251387312 /usr/include/gtk-2.0/gtk/gtkeventbox.h - - -1251387312 /usr/include/gtk-2.0/gtk/gtkexpander.h - - -1251387312 /usr/include/gtk-2.0/gtk/gtkfixed.h - - -1251387312 /usr/include/gtk-2.0/gtk/gtkfilechooser.h - - - -1251387312 /usr/include/gtk-2.0/gtk/gtkfilefilter.h - - -1251387312 /usr/include/gtk-2.0/gtk/gtkfilechooserbutton.h - - - -1251387312 /usr/include/gtk-2.0/gtk/gtkhbox.h - - -1251387312 /usr/include/gtk-2.0/gtk/gtkfilechooserdialog.h - - - -1251387312 /usr/include/gtk-2.0/gtk/gtkfilechooserwidget.h - - - -1251387312 /usr/include/gtk-2.0/gtk/gtkfontbutton.h - - -1251387312 /usr/include/gtk-2.0/gtk/gtkfontsel.h - - - -1251387312 /usr/include/gtk-2.0/gtk/gtkgamma.h - - -1251387312 /usr/include/gtk-2.0/gtk/gtkgc.h - - -1251387312 /usr/include/gtk-2.0/gtk/gtkhandlebox.h - - -1251387312 /usr/include/gtk-2.0/gtk/gtkhbbox.h - - -1251387312 /usr/include/gtk-2.0/gtk/gtkhpaned.h - - -1251387312 /usr/include/gtk-2.0/gtk/gtkpaned.h - - -1251387312 /usr/include/gtk-2.0/gtk/gtkhruler.h - - -1251387312 /usr/include/gtk-2.0/gtk/gtkruler.h - - -1251387312 /usr/include/gtk-2.0/gtk/gtkhscale.h - - -1251387312 /usr/include/gtk-2.0/gtk/gtkscale.h - - -1251387312 /usr/include/gtk-2.0/gtk/gtkrange.h - - - -1251387312 /usr/include/gtk-2.0/gtk/gtkhscrollbar.h - - -1251387312 /usr/include/gtk-2.0/gtk/gtkscrollbar.h - - -1251387312 /usr/include/gtk-2.0/gtk/gtkhseparator.h - - -1251387312 /usr/include/gtk-2.0/gtk/gtkseparator.h - - -1251387312 /usr/include/gtk-2.0/gtk/gtkhsv.h - - -1251387312 /usr/include/gtk-2.0/gtk/gtkiconfactory.h - - - -1251387312 /usr/include/gtk-2.0/gtk/gtkicontheme.h - - - -1251387312 /usr/include/gtk-2.0/gtk/gtkiconview.h - - - - - - -1251387312 /usr/include/gtk-2.0/gtk/gtktooltip.h - - -1251387312 /usr/include/gtk-2.0/gtk/gtkimagemenuitem.h - - -1251387312 /usr/include/gtk-2.0/gtk/gtkimcontextsimple.h - - -1251387312 /usr/include/gtk-2.0/gtk/gtkimmulticontext.h - - - -1251387312 /usr/include/gtk-2.0/gtk/gtkinputdialog.h - - -1251387312 /usr/include/gtk-2.0/gtk/gtkinvisible.h - - -1251387312 /usr/include/gtk-2.0/gtk/gtklayout.h - - - -1251387312 /usr/include/gtk-2.0/gtk/gtklinkbutton.h - - -1251387312 /usr/include/gtk-2.0/gtk/gtkmain.h - - - - - -1251387312 /usr/include/gtk-2.0/gtk/gtkmenubar.h - - -1251387312 /usr/include/gtk-2.0/gtk/gtkmenutoolbutton.h - - - -1251387312 /usr/include/gtk-2.0/gtk/gtktoolbutton.h - - -1251387312 /usr/include/gtk-2.0/gtk/gtktoolitem.h - - - - -1251387313 /usr/include/gtk-2.0/gtk/gtktooltips.h - - - -1251387312 /usr/include/gtk-2.0/gtk/gtkmessagedialog.h - - -1251387312 /usr/include/gtk-2.0/gtk/gtkmodules.h - - -1251387312 /usr/include/gtk-2.0/gtk/gtkmountoperation.h - -1251387312 /usr/include/gtk-2.0/gtk/gtknotebook.h - - -1251387312 /usr/include/gtk-2.0/gtk/gtkorientable.h - - -1251387312 /usr/include/gtk-2.0/gtk/gtkpagesetup.h - - -1251387312 /usr/include/gtk-2.0/gtk/gtkpapersize.h - - -1251387312 /usr/include/gtk-2.0/gtk/gtkplug.h - - - -1251387312 /usr/include/gtk-2.0/gtk/gtksocket.h - - -1251387312 /usr/include/gtk-2.0/gtk/gtkprintcontext.h - - - -1251387312 /usr/include/gtk-2.0/gtk/gtkprintoperation.h - - - - - - - - -1251387312 /usr/include/gtk-2.0/gtk/gtkprintsettings.h - - -1251387312 /usr/include/gtk-2.0/gtk/gtkprintoperationpreview.h - - - -1251387312 /usr/include/gtk-2.0/gtk/gtkprogressbar.h - - -1251387313 /usr/include/gtk-2.0/gtk/gtkprogress.h - - - -1251387312 /usr/include/gtk-2.0/gtk/gtkradioaction.h - - -1251387312 /usr/include/gtk-2.0/gtk/gtktoggleaction.h - - -1251387312 /usr/include/gtk-2.0/gtk/gtkradiobutton.h - - -1251387312 /usr/include/gtk-2.0/gtk/gtkradiomenuitem.h - - -1251387312 /usr/include/gtk-2.0/gtk/gtkradiotoolbutton.h - - -1251387312 /usr/include/gtk-2.0/gtk/gtktoggletoolbutton.h - - -1251387312 /usr/include/gtk-2.0/gtk/gtkrecentaction.h - - - -1251387312 /usr/include/gtk-2.0/gtk/gtkrecentmanager.h - - - - -1251387312 /usr/include/gtk-2.0/gtk/gtkrecentchooser.h - - - - -1251387312 /usr/include/gtk-2.0/gtk/gtkrecentfilter.h - - -1251387312 /usr/include/gtk-2.0/gtk/gtkrecentchooserdialog.h - - - -1251387312 /usr/include/gtk-2.0/gtk/gtkrecentchoosermenu.h - - - -1251387312 /usr/include/gtk-2.0/gtk/gtkrecentchooserwidget.h - - - -1251387312 /usr/include/gtk-2.0/gtk/gtkscalebutton.h - - -1251387312 /usr/include/gtk-2.0/gtk/gtkscrolledwindow.h - - - - -1251387313 /usr/include/gtk-2.0/gtk/gtkvscrollbar.h - - -1251387313 /usr/include/gtk-2.0/gtk/gtkviewport.h - - - -1251387312 /usr/include/gtk-2.0/gtk/gtkseparatormenuitem.h - - -1251387312 /usr/include/gtk-2.0/gtk/gtkseparatortoolitem.h - - -1251387312 /usr/include/gtk-2.0/gtk/gtkshow.h - -1251387312 /usr/include/gtk-2.0/gtk/gtksizegroup.h - - -1251387312 /usr/include/gtk-2.0/gtk/gtkspinbutton.h - - - -1251387312 /usr/include/gtk-2.0/gtk/gtkstatusbar.h - - -1251387312 /usr/include/gtk-2.0/gtk/gtkstatusicon.h - - - -1251387312 /usr/include/gtk-2.0/gtk/gtkstock.h - - - -1251387312 /usr/include/gtk-2.0/gtk/gtktable.h - - -1251387312 /usr/include/gtk-2.0/gtk/gtktearoffmenuitem.h - - -1251387312 /usr/include/gtk-2.0/gtk/gtktextbuffer.h - - - - - - - -1251387312 /usr/include/gtk-2.0/gtk/gtktexttagtable.h - - -1251387312 /usr/include/gtk-2.0/gtk/gtktextmark.h - -1251387312 /usr/include/gtk-2.0/gtk/gtktextbufferrichtext.h - - -1251387312 /usr/include/gtk-2.0/gtk/gtktextview.h - - - - - -1251387312 /usr/include/gtk-2.0/gtk/gtktoolbar.h - - - - - - -1251387313 /usr/include/gtk-2.0/gtk/gtkpixmap.h - - -1251387312 /usr/include/gtk-2.0/gtk/gtktoolshell.h - - -1251387312 /usr/include/gtk-2.0/gtk/gtktestutils.h - -1251387312 /usr/include/gtk-2.0/gtk/gtktreednd.h - - - -1251387312 /usr/include/gtk-2.0/gtk/gtktreemodelsort.h - - - - -1251387312 /usr/include/gtk-2.0/gtk/gtktreeselection.h - - -1251387312 /usr/include/gtk-2.0/gtk/gtktreestore.h - - - - - -1251387312 /usr/include/gtk-2.0/gtk/gtkuimanager.h - - - - - -1251387312 /usr/include/gtk-2.0/gtk/gtkvbbox.h - - -1251387313 /usr/include/gtk-2.0/gtk/gtkversion.h - -1251387313 /usr/include/gtk-2.0/gtk/gtkvolumebutton.h - - -1251387313 /usr/include/gtk-2.0/gtk/gtkvpaned.h - - -1251387313 /usr/include/gtk-2.0/gtk/gtkvruler.h - - -1251387313 /usr/include/gtk-2.0/gtk/gtkvscale.h - - -1251387313 /usr/include/gtk-2.0/gtk/gtkvseparator.h - - -1251387313 /usr/include/gtk-2.0/gtk/gtktext.h - - -1251387313 /usr/include/gtk-2.0/gtk/gtkoldeditable.h - - -1251387313 /usr/include/gtk-2.0/gtk/gtktree.h - - -1251387313 /usr/include/gtk-2.0/gtk/gtktreeitem.h - - -1251387313 /usr/include/gtk-2.0/gtk/gtkclist.h - - - - - - - -1251387313 /usr/include/gtk-2.0/gtk/gtkcombo.h - - -1251387313 /usr/include/gtk-2.0/gtk/gtkctree.h - - -1251387313 /usr/include/gtk-2.0/gtk/gtkfilesel.h - - -1251387313 /usr/include/gtk-2.0/gtk/gtkitemfactory.h - - -1251387313 /usr/include/gtk-2.0/gtk/gtklist.h - - -1251387313 /usr/include/gtk-2.0/gtk/gtklistitem.h - - -1251387313 /usr/include/gtk-2.0/gtk/gtkoptionmenu.h - - -1251387313 /usr/include/gtk-2.0/gtk/gtkpreview.h - - -1251387313 /usr/include/gtk-2.0/gtk/gtktipsquery.h - - -1251410353 /usr/local/src/pcsx2/plugins/onepad/joystick.h - - - "onepad.h" - "controller.h" - -1251414438 /usr/include/SDL/SDL.h - "SDL_main.h" - "SDL_stdinc.h" - "SDL_audio.h" - "SDL_cdrom.h" - "SDL_cpuinfo.h" - "SDL_endian.h" - "SDL_error.h" - "SDL_events.h" - "SDL_loadso.h" - "SDL_mutex.h" - "SDL_rwops.h" - "SDL_thread.h" - "SDL_timer.h" - "SDL_video.h" - "SDL_version.h" - "begin_code.h" - "close_code.h" - -1251414438 /usr/include/SDL/SDL_main.h - "SDL_stdinc.h" - "begin_code.h" - "close_code.h" - "begin_code.h" - "close_code.h" - -1251414438 /usr/include/SDL/SDL_stdinc.h - "SDL_config.h" - - - - - - - - - - - - - - - - - "begin_code.h" - - - - - - "close_code.h" - -1251414438 /usr/include/SDL/SDL_config.h - "SDL_platform.h" - - -1251414438 /usr/include/SDL/SDL_platform.h - -1251414438 /usr/include/SDL/begin_code.h - -1251414438 /usr/include/SDL/close_code.h - -1251414438 /usr/include/SDL/SDL_audio.h - "SDL_stdinc.h" - "SDL_error.h" - "SDL_endian.h" - "SDL_mutex.h" - "SDL_thread.h" - "SDL_rwops.h" - "begin_code.h" - "close_code.h" - -1251414438 /usr/include/SDL/SDL_error.h - "SDL_stdinc.h" - "begin_code.h" - "close_code.h" - -1251414438 /usr/include/SDL/SDL_endian.h - "SDL_stdinc.h" - "begin_code.h" - "close_code.h" - -1251414438 /usr/include/SDL/SDL_mutex.h - "SDL_stdinc.h" - "SDL_error.h" - "begin_code.h" - "close_code.h" - -1251414438 /usr/include/SDL/SDL_thread.h - "SDL_stdinc.h" - "SDL_error.h" - "SDL_mutex.h" - "begin_code.h" - - "close_code.h" - -1251414438 /usr/include/SDL/SDL_rwops.h - "SDL_stdinc.h" - "SDL_error.h" - "begin_code.h" - "close_code.h" - -1251414438 /usr/include/SDL/SDL_cdrom.h - "SDL_stdinc.h" - "SDL_error.h" - "begin_code.h" - "close_code.h" - -1251414438 /usr/include/SDL/SDL_cpuinfo.h - "SDL_stdinc.h" - "begin_code.h" - "close_code.h" - -1251414438 /usr/include/SDL/SDL_events.h - "SDL_stdinc.h" - "SDL_error.h" - "SDL_active.h" - "SDL_keyboard.h" - "SDL_mouse.h" - "SDL_joystick.h" - "SDL_quit.h" - "begin_code.h" - "close_code.h" - -1251414438 /usr/include/SDL/SDL_active.h - "SDL_stdinc.h" - "SDL_error.h" - "begin_code.h" - "close_code.h" - -1251414438 /usr/include/SDL/SDL_keyboard.h - "SDL_stdinc.h" - "SDL_error.h" - "SDL_keysym.h" - "begin_code.h" - "close_code.h" - -1251414438 /usr/include/SDL/SDL_keysym.h - -1251414438 /usr/include/SDL/SDL_mouse.h - "SDL_stdinc.h" - "SDL_error.h" - "SDL_video.h" - "begin_code.h" - "close_code.h" - -1251414438 /usr/include/SDL/SDL_video.h - "SDL_stdinc.h" - "SDL_error.h" - "SDL_rwops.h" - "begin_code.h" - "close_code.h" - -1251414438 /usr/include/SDL/SDL_joystick.h - "SDL_stdinc.h" - "SDL_error.h" - "begin_code.h" - "close_code.h" - -1251414438 /usr/include/SDL/SDL_quit.h - "SDL_stdinc.h" - "SDL_error.h" - -1251414438 /usr/include/SDL/SDL_loadso.h - "SDL_stdinc.h" - "SDL_error.h" - "begin_code.h" - "close_code.h" - -1251414438 /usr/include/SDL/SDL_timer.h - "SDL_stdinc.h" - "SDL_error.h" - "begin_code.h" - "close_code.h" - -1251414438 /usr/include/SDL/SDL_version.h - "SDL_stdinc.h" - "begin_code.h" - "close_code.h" - -1251410353 /usr/local/src/pcsx2/plugins/onepad/onepad.h - - - - - - - - - - - - "PS2Edefs.h" - "joystick.h" - "analog.h" - "bitwise.h" - "controller.h" - -1252273249 /usr/local/src/pcsx2/common/include/PS2Edefs.h - "Pcsx2Defs.h" - -1252273249 /usr/local/src/pcsx2/common/include/Pcsx2Defs.h - "Pcsx2Types.h" - - - -1252273249 /usr/local/src/pcsx2/common/include/Pcsx2Types.h - "stdint.h" - -1251410471 /usr/local/src/pcsx2/common/include/intrin_x86.h - -1251410353 /usr/local/src/pcsx2/plugins/onepad/analog.h - "onepad.h" - -1251410353 /usr/local/src/pcsx2/plugins/onepad/bitwise.h - -1251410353 /usr/local/src/pcsx2/plugins/onepad/controller.h - -1251410353 /usr/local/src/pcsx2/plugins/onepad/Linux/linux.h - "joystick.h" - "keyboard.h" - "onepad.h" - - - - - "interface.h" - "support.h" - "callbacks.h" - -1252300877 /usr/local/src/pcsx2/plugins/onepad/keyboard.h - "onepad.h" - "Linux/linux.h" - -1251387304 /usr/include/gtk-2.0/gdk/gdkkeysyms.h - -1251410353 /usr/local/src/pcsx2/plugins/onepad/Linux/interface.h - -1251410353 /usr/local/src/pcsx2/plugins/onepad/Linux/support.h - - - - -1251410353 /usr/local/src/pcsx2/plugins/onepad/Linux/callbacks.h - - -1251410353 source:/usr/local/src/pcsx2/plugins/onepad/Linux/ini.cpp - - - - "joystick.h" - "onepad.h" - "linux.h" - "interface.h" - "support.h" - "callbacks.h" - -1252300853 source:/usr/local/src/pcsx2/plugins/onepad/Linux/interface.c - - - - - - - - - "callbacks.h" - "interface.h" - "support.h" - -1251410353 source:/usr/local/src/pcsx2/plugins/onepad/Linux/linux.cpp - "linux.h" - -1251410353 source:/usr/local/src/pcsx2/plugins/onepad/Linux/support.c - - - - - - - - "support.h" - -1251410353 source:/usr/local/src/pcsx2/plugins/onepad/analog.cpp - "analog.h" - -1251410353 source:/usr/local/src/pcsx2/plugins/onepad/controller.cpp - "onepad.h" - "controller.h" - -1251410353 source:/usr/local/src/pcsx2/plugins/onepad/joystick.cpp - "joystick.h" - -1252300865 source:/usr/local/src/pcsx2/plugins/onepad/keyboard.cpp - "keyboard.h" - -1251410353 source:/usr/local/src/pcsx2/plugins/onepad/onepad.cpp - - - - - - "onepad.h" - - "svnrev.h" - diff --git a/plugins/onepad/Linux/gui.cpp b/plugins/onepad/Linux/gui.cpp index ade71e8006..2bf0263ce0 100644 --- a/plugins/onepad/Linux/gui.cpp +++ b/plugins/onepad/Linux/gui.cpp @@ -106,9 +106,6 @@ void create_a_column(GtkWidget *view, const char *name, int num, bool visible) void create_columns(GtkWidget *view) { - GtkCellRenderer *renderer; - GtkTreeViewColumn *col; - if (!has_columns) { create_a_column(view, "Pad #", COL_PAD, true); @@ -372,4 +369,4 @@ EXPORT_C_(void) PADabout() EXPORT_C_(s32) PADtest() { return 0; -} \ No newline at end of file +} diff --git a/plugins/onepad/Linux/linux.cpp b/plugins/onepad/Linux/linux.cpp index 97e8d990a1..84bbe14af5 100644 --- a/plugins/onepad/Linux/linux.cpp +++ b/plugins/onepad/Linux/linux.cpp @@ -63,7 +63,7 @@ void _PADclose() int _GetJoystickIdFromPAD(int pad) { // select the right joystick id - int joyid = -1; + u32 joyid = -1; for (int p = 0; p < MAX_SUB_KEYS; p++) { diff --git a/plugins/onepad/analog.cpp b/plugins/onepad/analog.cpp index 1e07f1c239..2c849eaafb 100644 --- a/plugins/onepad/analog.cpp +++ b/plugins/onepad/analog.cpp @@ -124,7 +124,7 @@ namespace Analog void ConfigurePad( u8 pad, int index, int value) { - int temp = Pad(pad, index); + Pad(pad, index); SetPad(pad, index, value / 256); if (RevertPad(index)) InvertPad(pad,index); SetPad(pad, index, Pad(pad, index) + 0x80); diff --git a/plugins/onepad/controller.cpp b/plugins/onepad/controller.cpp index 9ea3205560..709edb9c87 100644 --- a/plugins/onepad/controller.cpp +++ b/plugins/onepad/controller.cpp @@ -24,7 +24,7 @@ HatPins hat_position = {false, false, false, false}; -__forceinline int set_key(int pad, int index, int value) +__forceinline void set_key(int pad, int index, int value) { conf.keys[pad][index] = value; } diff --git a/plugins/onepad/controller.h b/plugins/onepad/controller.h index 7eb5cc9342..2950c763c3 100644 --- a/plugins/onepad/controller.h +++ b/plugins/onepad/controller.h @@ -44,7 +44,7 @@ enum KeyType PAD_NULL = -1 }; -extern int set_key(int pad, int index, int value); +extern void set_key(int pad, int index, int value); extern int get_key(int pad, int index); extern KeyType type_of_key(int pad, int index); @@ -126,4 +126,4 @@ typedef struct extern PADconf conf; extern PADAnalog g_lanalog[2], g_ranalog[2]; -#endif \ No newline at end of file +#endif diff --git a/plugins/onepad/onepad.cpp b/plugins/onepad/onepad.cpp index 585e3c7178..dfe3a46d2b 100644 --- a/plugins/onepad/onepad.cpp +++ b/plugins/onepad/onepad.cpp @@ -364,7 +364,7 @@ EXPORT_C_(u8) PADstartPoll(int pad) u8 _PADpoll(u8 value) { - u8 button_check = 0, button_check2 = 0; + u8 button_check = 0; const int avg_pressure = (pressure * 255) / 100; if (curByte == 0) @@ -402,7 +402,7 @@ u8 _PADpoll(u8 value) else cmdLen = 4; - button_check2 = stdpar[curPad][2] >> 4; + button_check = stdpar[curPad][2] >> 4; switch (stdpar[curPad][3]) { case 0xBF: // X @@ -448,7 +448,7 @@ u8 _PADpoll(u8 value) stdpar[curPad][19] = 0x00; // Not pressed break; } - switch (button_check2) + switch (button_check) { case 0xE: // UP stdpar[curPad][10] = avg_pressure;